Merge origin/master

Conflicts:
	model/userProject/User.php
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	model/userProject/User.php