Merging
Merge branch 'master' of https://github.com/darkbox/TimesApp

Conflicts:
	app/View/Hours/timer.ctp