Remove from git
Merge branch 'master' of github.com:127001/sciencelab-qt

Conflicts:
	cordovaqt.pro.user