1
Merge remote-tracking branch 'origin/master'

Conflicts:
	QtCppE/QtCppE.pro
	QtCppE/main.cpp