login bug fixes
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls

Conflicts:
	app/index.html
	app/views/skroll.html
Merge branch 'master' of https://github.com/ne0n666/Skrolls