update style
add ignore
Merge branch 'develop'

Conflicts:
	frontend/src/WEB-INF/view/index.ftl