Merge pull request #1 from hanish92/master

Master to Flower Multistore
Merge pull request #4 from hanish92/master

Flower Multistore Cleanup
Merge pull request #5 from hanish92/Flower-Multistore

Flower multistore