Workign sample for Jo
Merge branch 'develop' into feature/exception

* develop:
  Workign sample for Jo

Conflicts:
	src/main/webapp/WEB-INF/views/search.jspx