Wstęp do wiki
Synchro
Merge branch 'master' of https://github.com/unoduetre/ACoDIS

Conflicts:
	src/main/webapp/WEB-INF/faces-config.xml
	src/main/webapp/contracts/template/protect.xhtml