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

Conflicts:
	src/main/java/br/edu/uniritter/liquid/democracy/controller/CitizenController.java
	src/main/java/br/edu/uniritter/liquid/democracy/model/Candidate.java
	src/main/java/br/edu/uniritter/liquid/democracy/repository/CitizenRepository.java
	src/main/java/br/edu/uniritter/liquid/democracy/service/impl/CitizenServiceImpl.java