Merge branch 'master' of apps:rc

Merging kronos
ne 999
Merge branch 'master' of https://github.com/cheiff/rc

merging