Merge branch 'master' into develop
moved controller to RESTfulController because of conflicts
Merge branch 'develop'