Solving the register state
Merge remote-tracking branch 'origin/feature/login' into feature/login

Conflicts:
	app/scripts/states/register.coffee