before merge
Merge branch 'master' of https://github.com/Factor-X/citizens-reserve

Conflicts:
	app/eu/factorx/citizens/angular/views/household/profile/household-profile.html
before merge
Merge branch 'master' of https://github.com/Factor-X/citizens-reserve
Batch service
batch service