Merge branch 'master' of https://github.com/DJChopstix13/in2indie

Conflicts:
	app.js
	package.json
	web-client/views/index.jade
	web-client/views/layout.jade
Merge branch 'test'

Conflicts:
	app.js
	web-client/views/index.jade
	web-client/views/layout.jade
fixing merge issues with heroku and github
fixing heroku and facebook authentication