backup
Merge branch 'develop' of https://github.com/ahanisch/serp.git into
develop

Conflicts:
	src/main/webapp/views/main.jsp