Merge branch 'hotfix/fix-feedback-api' into develop
Merge branch 'develop' of github.com:eCrowdMedia/OAuthAPI into develop