Dinup:
Merge branch 'master' of https://github.com/RAPID5/GOSHOP.git