Added shortcuts popup
Added shortcuts functionality, updated js files
Merge branch 'dev'

Conflicts:
	js/timeomat.js