Home change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/edit.ftl
	src/main/webapp/WEB-INF/pages/viewPage.ftl