Merge branch 'release/css_fix'
helper fix
fuck fontawesome
Merge branch 'hotfix/assets_fix' into develop