Removed all apam properties for the Clock, it triggers a bug with apam
Trying to fix issues introduced with #321 and #322
Merge branch 'master' of https://github.com/appsgate2015/appsgate