Merge origin/master

Conflicts:
	controller/sign/validsignup.php
Merge origin/master