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

Conflicts:
	app/eu/factorx/citizens/angular/controllers/FormCtrl.coffee
before merge
Merge branch 'master' of https://github.com/Factor-X/citizens-reserve

Conflicts:
	app/eu/factorx/citizens/angular/controllers/FormCtrl.coffee
	conf/application.conf
	public/javascripts/app.js
Separated controllers for 'profile' and 'actions'
Merge branch 'master' of https://github.com/Factor-X/citizens-reserve

Conflicts:
	public/javascripts/app.js