#37 Merge and errors implemented
Merge branch 'master' of git@github.com:dmatej/cis-config.git

Conflicts:
	cis-config-war/src/main/webapp/config/user/list.xhtml