[OE-3914] fixed collation
[OE-3731] Fixed grunt build
Merge branch 'feature/assets' into develop
Merge branch 'feature/controller-refactor' into develop
Merge branch 'develop' into release/1.6