login page
Merge branch 'master' of https://github.com/dbkegley/Butterfly_Parse_POCs

Conflicts:
	Resources/iphone/alloy/controllers/index.js
	app/controllers/index.js
lkajsdf