#46,#47,#48,#49
#46,#7,#48,#49
Merge branch 'master' of https://github.com/mbalazs/storegarage-ps