Merge branch 'master' into ui
added dashboard
Merge branch 'master' into ui

Conflicts:
	log/frontend_dev.log
added ui for new examinations dashboard
Merge branch 'ui'