In Class Code Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	In class code/something.pro.user