can't remember what I did
Merge branch 'master' of https://github.com/silbermm/anchor-spring

Conflicts:
	src/main/webapp/WEB-INF/views/index.jsp