weapons, ammo bonus, some fixes,
Merge remote-tracking branch 'origin/loadScreen'

Conflicts:
	data/hero.json
	index.html