Working on excepitons handling
Merge branch 'master' into feature/exception

* master:
  Making minor changes

Conflicts:
	src/main/webapp/WEB-INF/views/index.jspx
Merge branch 'develop' into feature/exception

* develop:
Merge branch 'master' into feature/exception

* master:
  fixed custom layout with Jo
  Revert "Making minor changes"
blah
Merge branch 'develop' into feature/exception

* develop:
  Workign sample for Jo

Conflicts:
	src/main/webapp/WEB-INF/views/search.jspx
Merge branch 'feature/exception' into develop