Local commit
Merge branch 'master' of https://github.com/the-ramones/ejb-retail.git