Merge branch 'master' of https://github.com/mvanasse/peril

Conflicts:
	phone/Gruntfile.js
Merge branch 'master' of https://github.com/mvanasse/peril

Conflicts:
	common/jade/index.jade
	phone/Gruntfile.js
	phone/src/js/peril-services.js
	phone/src/js/peril.js
	phone/src/less/main.less
	phone/www/index.html
	phone/www/js/app.js
	phone/www/partials/login.html