Add app.js and all views
Merge branch 'master' of github.com:toberndo/www.mailvelope.com

Conflicts:
	views/incl/about.html