move to qt5 II
Merge remote-tracking branch 'origin/qt5'

Conflicts:
	.gitignore