[OE-3482] Gii Sass and Grunt generation
Merge branch 'develop' into feature/front-end-rewrite
[OE-3683] Fixed margin issue