Updated web.xml for working on excepitons
Merge branch 'master' into develop

* master:
  Making minor changes
Revert "Making minor changes"

This reverts commit d6f94e3090f272620fc46dd5da96a018b3a594d9.
fixed custom layout with Jo