Ekoja sivupohjia
Merge branch 'silp' into development

Conflicts:
	src/main/webapp/WEB-INF/templates/index.html