new css
Merge branch 'master' of ssh://git@github.com/Bridea/SIAK.git

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