mixing updates
Merge branch 'master' of https://github.com/RainsparkLabs/B-Con

Conflicts:
	app/app.js
	app/routes/home/home.tpl.html