Bug fix
Merge branch 'master' of github.com:productiveme/timesheets

Conflicts:
	tim-min.js
Bug fix