Merge pull request #13 from jannah/DIRK

Dirk
Time features working
Merge branch 'master' of https://github.com/jannah/podium

Conflicts:
	_css/style.css
	_js/display-operations.js
bug fix
added feedback function
fixed event logging
removed console logs
removed cancel button for user demographics
Merge branch 'master' into DIRK