Change hour/ hours wording in front view.
Merge remote-tracking branch 'github/Release_Version_2.0' into Release_Version_2.0