fixed wrong ordering of elements in web.xml
Merge remote-tracking branch 'origin/develop' into develop