giftshop CMS and image uploader complete
Merge branch 'master' of https://github.com/cvoorber/NMDH