Implementing login + facebook
Merge branch 'master' of https://github.com/rohitverma007/angelhack2014

Conflicts:
	www/js/controllers.js
Fixing facebook login, implementing parse queries, maps ,
MergeFixes