Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/min/plugins.min.js
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/pages/min/addEblast.min.js
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/pages/min/contacts-listing.min.js
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/pages/min/contacts.min.js
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/pages/min/eblasts-custom.min.js
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/pages/min/eblasts.min.js
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/pages/min/profile.min.js
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/pages/min/reports-sends.min.js
	src/Metrostudio/ContaktaBundle/Resources/public/panel/js/pages/min/send.min.js
Merge origin/master