fixed errors in conditions
Merge branch 'master' of https://github.com/Factor-X/citizens-reserve
Merge branch 'master' of https://github.com/Factor-X/citizens-reserve

Conflicts:
	app/eu/factorx/citizens/angular/services/SurveyDTOService.coffee
Replaced citizensreserve.be by citizensreserve.factorx.eu