Merge branch 'development' into MAGEMEP-131

Conflicts:
	src/app/code/community/Flagbit/MEP/Model/Export/Entity/Product.php
Merge branch 'MAGEMEP-131' into development