Fixed encoding problem
Merge branch 'master' of https://github.com/Factor-X/citizenReserve

Conflicts:
	app/eu/factorx/citizens/model/survey/Period.java
	app/eu/factorx/citizens/service/impl/CalculationServiceImpl.java
	test/eu/factorx/citizens/service/CalculationServiceTest.java