Mirror entity changes in REST API
Merge branch 'master' into develop
Removed obsolete js files