add server-side support for period labels
add client-side support for period labels
bugfix
Merge branch 'master' into kettle-deployment