Ekoja sivupohjia
Merge branch 'silp' into development

Conflicts:
	src/main/webapp/WEB-INF/templates/index.html
Merge commit '9d1214d6ba4cb2968201be8084d30ef0f95c452b' into dev
Indexin korjaus