product manager
product manager
household menu
solve bug for admin connection
Merge branch 'master' into other_calculator

Conflicts:
	app/eu/factorx/awac/angular/views/event/agreement_fr.jade
	app/eu/factorx/awac/angular/views/event/confidentiality_fr.jade
	app/eu/factorx/awac/angular/views/event/help_actions_fr.jade
	app/eu/factorx/awac/angular/views/event/help_form_fr.jade
	app/eu/factorx/awac/angular/views/event/help_results_fr.jade
	app/eu/factorx/awac/angular/views/event/help_user_data_fr.jade
	conf/routes
	data_importer_resources/translations/translations_common.xls
	migrations/migration-data-v1.0-v1.1/cmd.sh
Merge branch 'master' into other_calculator

Conflicts:
	app/eu/factorx/awac/angular/views/event/agreement_fr.jade
	app/eu/factorx/awac/angular/views/event/confidentiality_fr.jade
	app/eu/factorx/awac/angular/views/event/help_actions_fr.jade
	app/eu/factorx/awac/angular/views/event/help_form_fr.jade
	app/eu/factorx/awac/angular/views/event/help_results_fr.jade
	app/eu/factorx/awac/angular/views/event/help_user_data_fr.jade
	conf/routes
	data_importer_resources/translations/translations_common.xls
	migrations/migration-data-v1.0-v1.1/cmd.sh
Merge branch 'other_calculator'