Add Citizen mappping
Merge branch 'master' of https://github.com/uniritter/liquid-democracy

Conflicts:
	src/main/webapp/WEB-INF/jsp/template/header.jsp