Done some refactoring for better inheritance
Merge branch 'develop' of git://github.com/sulu-cmf/SuluProductBundle into feature/productinternalfilter