commit for syncing
Merge branch 'master' of https://github.com/dare5421/MasterMeasure

Conflicts:
	MasterMeasure.pro.user