angular
Merge branch 'gh-pages' of https://github.com/naitse/mbox into gh-pages

Conflicts:
	js/views/global/global.js