Actitime integration
Merge branch 'master' of https://github.com/Arugin/cms
Actuals views, controller