refactoring and design fix
Merge branch 'feature/sing_up_fix_#49' into staging

Conflicts:
	lib/auth_helper.rb