Merge branch 'Development'
Trying to change static content middleware
Merge branch 'master' into Development