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

Conflicts:
	WebContent/test.html