User timesheet period
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/app/controllers/userhome_controller.rb
Merge branch 'master' of https://github.com/caioddm/TimeTracker