update .pro.user
Merge remote-tracking branch 'origin/master'

Conflicts:
	Begin.pro.user