Merge branch 'master' of https://github.com/richojarlson/enter-admin-dashboard

Conflicts:
	app/js/config.js
Merge remote-tracking branch 'origin/master'