as
Merge branch 'master' of https://github.com/mechanicalmind/swinteamzoopblofg.git

Conflicts:
	app/html/register.php