Merge branch 'feature/product-types' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluProductBundle into develop