small fix
Merge branch 'silp' into comments

Conflicts:
	src/main/webapp/WEB-INF/templates/view.html
fix comments