Merge remote-tracking branch 'origin/master'

Conflicts:
	SignUp.php

edit page
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 1fb978cb81f8b13d267af4822ec3dffa4109049c.
hmm
Merge remote-tracking branch 'origin/master'

Conflicts:
	SignUp.php
	core.inc.php