Merge branch 'hotfix/addFOSRestBundle' into develop
Merge branch 'develop'