Register advance
Merge branch 'master' of https://github.com/CrabLabs/Wallas

Conflicts:
	client/templates/register.html
Merge branch 'master' of https://github.com/CrabLabs/Wallas