stopped double inclusion exception
Merge branch 'develop' of https://github.com/xepan/xShop into develop
bugs removed