Fixed stuff and forgot to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	json/register.php