Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Removed HTTP Content-Type check from retrieveByCode function in
EventController
Updated controllers with Access-Control-Allow-Origin header
Merge branch 'master' into develop