#GE-87 work 3h calandar changes
Merge branch 'master' of https://github.com/gusennan/android-times-square into HEAD