login-screen updates: add a 3rd button "use id + token", which when
clicked will switch the login screen input values. we had to remove the
fonts from the PSDs since i don't have them on my machine, but I want to
add them back in
Merge branch 'master' of github.com:HabitRPG/habitrpg-mobile

Conflicts:
	app/views/login.html