changes from server
Merge branch 'dev' of https://github.com/SocialShoppingNetwork/Competitive-Social-Shopping-Django into dev