Signed-off-by: Piotr Socha <piotr.socha@polcode.com>
Merge branch 'refactoring/beta4' of git@github.com:quitemax/Hi-Content-Manager.git into refactoring/beta4