[ESG-1663] added tablekit stuff to modman file
[MAGEMEP-131] Fixing tabs not working in preview
[ESG-1672] added own logic for is_in_stock attribute
Merge branch 'ESG-1672' into development
[FIX] Use special filters even though no rules are set
Merge branch 'development' of https://github.com/Flagbit/Magento-MEP into development
Merge branch 'development' into MAGEMEP-130

Conflicts:
	src/app/code/community/Flagbit/MEP/Model/Export/Entity/Product.php