Merge branch 'master' of https://github.com/kanaya/AmbientClock
Merge branch 'master' into develop