Merge origin/test into test

Conflicts:
	web/bundles/contakta/app/controllers/contacts/min/contactsController.min.js
	web/bundles/contakta/app/controllers/contacts/min/contactsImportController.min.js
	web/bundles/contakta/app/factories/min/factories.min.js
	web/bundles/contakta/panel/css/styles.css
	web/bundles/contakta/panel/js/min/plugins.min.js
	web/bundles/contakta/panel/js/pages/min/contacts-add-import.min.js
	web/bundles/contakta/panel/js/pages/min/eblasts-custom.min.js