Items
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/game/main.js