Merge branch 'hotfix/ident'
comments allowed on time entries
Merge branch 'master' into develop