.
Merge branch 'master' of https://github.com/phristov/kss

Conflicts:
	src/main/webapp/WEB-INF/templates/header.xhtml