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

Conflicts:
	app/index.html
	app/partials/main.html
	app/partials/ticket.html
	app/partials/workPlaceList.html
Merge branch 'master' of https://github.com/richojarlson/enter-admin-dashboard

Conflicts:
	app/js/config.js