Merge branch 'master' into ui-template
Countdown timers initial implementation
Merge branch 'ui-template' of https://github.com/projectegon/egon into ui-template

Conflicts: (resolved)
	app/assets/javascripts/application.js