some fixes
Merge origin/master
Merge branch 'master' of https://github.com/luisboch/hour_management
message fix