Merge branch 'hotfix/UpdateRails'
remove assets group
Merge branch 'hotfix/SyntaxFix' into develop