Merge remote-tracking branch 'origin/master'

Conflicts:
	parseApp/mainApp/bin/Debug/mainApp.exe
	parseApp/mainApp/bin/Debug/mainApp.pdb
	parseApp/mainApp/obj/Debug/mainApp.exe
	parseApp/mainApp/obj/Debug/mainApp.pdb
	parseApp/parseApp.v11.suo