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

Conflicts:
	src/main/webapp/WEB-INF/glassfish-web.xml
	src/main/webapp/index.xhtml