dashboard and event manage
Merge remote-tracking branch 'origin/master'

Conflicts:
	content/styles/dashBoardStyles.css