a
Merge remote-tracking branch 'mlh/master'

Conflicts:
	src/MachineLearningHeights.pro.user
Changed pro.user config