Passport Local Strategy using new API
Resolving integration between client app and new login API
Merge branch 'master' into passport

Conflicts:
	app.js
	data/Triplets._coffee
Enabling Google and Facebook login with new login code
Merge remote-tracking branch 'origin/master'