Merge branch 'master' into development
moved authenticateRequest() from Module to Controller
Merge branch 'development'