Luke is teaching me Javascript
Merge branch 'master' of https://github.com/riis/CallCenterDashboard

Conflicts:
	CallCenterManager/src/main/webapp/resources/app/dashboard/dashboard.tpl.html