Merge branch 'master' into Alternative_way

# Conflicts:
#	Test_Cases/Online/Results/S0.txt
#	Test_Cases/Online/Results/S1.txt
#	Test_Cases/Online/Results/S10.txt
#	Test_Cases/Online/Results/S1000.txt
#	Test_Cases/Online/Results/S10000.txt
#	Test_Cases/Online/Results/S116.txt
#	Test_Cases/Online/Results/S14.txt
#	Test_Cases/Online/Results/S20-1.txt
#	Test_Cases/Online/Results/S20-2.txt
#	Test_Cases/Online/Results/S3-1.txt
#	Test_Cases/Online/Results/S3-2.txt
#	Test_Cases/Online/Results/S3-3.txt
#	Test_Cases/Online/Results/S3-4.txt
#	Test_Cases/Online/Results/S3-5.txt
#	Test_Cases/Online/Results/S3-6.txt
#	Test_Cases/Online/Results/S3-7.txt
#	Test_Cases/Online/Results/S4-1.txt
#	Test_Cases/Online/Results/S4-2.txt
#	Test_Cases/Online/Results/S4-3.txt
#	Test_Cases/Online/Results/S4-4.txt
#	Test_Cases/Online/Results/S4-5.txt
#	Test_Cases/Online/Results/S4-6.txt
#	Test_Cases/Online/Results/S45.txt
#	Test_Cases/Online/Results/S46.txt
#	Test_Cases/Online/Results/S5-1.txt
#	Test_Cases/Online/Results/S5-2.txt
#	Test_Cases/Online/Results/S50-1.txt
#	Test_Cases/Online/Results/S50-2.txt
#	Test_Cases/Online/Results/S5000.txt