some login related changes
Merge branch 'master' of github.com:CollabCombat/CollabCombat-iOS

Conflicts:
	CollabCombat-iOS/CollabCombat-iOS/www/index.html