v0.2.4 added
cordova Facebook API added
facebook login handled if already logged in
Merge branch 'feature/facebook-integration' into develop
Merge branch 'develop'

Conflicts:
	app/index.html
	app/templates/scripts.html
v0.2.5 release