[#ADMCON-51: addapted to use new editor]
Merge branch 'master' of https://github.com/mxhero/bccpolicy-app