PS-2016.2.1 <jfrintrop@IT-SYS Merge branch 'master'
PS-2016.2.1 <jfrintrop@IT-SYS Merge branch 'master'
megadruck/Shopware-Test1,megadruck/Shopware-Test1,megadruck/Shopware-Test1,megadruck/Shopware-Test1