fix for entity name management in BikiniStore
Merge branch 'absinthe' of https://github.com/mwaylabs/The-M-Project into absinthe