Merge branch 'release_3.0'
Fixed shop loading problem

The shop items wouldn't load, so the JS code was edited to fix that.
Updated README.md
Merge branch 'hotfix_3.0.1' into develop

Conflicts:
	README.md