Phili's Branch
Merge branch 'Phili's_Branch'

Conflicts:
	public/register.php