templates for actions/state/property/events
Merge branch 'master' of https://github.com/appsgate2015/appsgate into local
Clock now has two digits time (i.e. 00:00)