SECURITY!!!
Merge branch 'master' of https://github.com/badamowski/DSMHack

Conflicts:
	chrysalis-public/www/js/app.js