updat map
Merge remote-tracking branch 'remotes/origin/Levels' into alex
Merge remote-tracking branch 'remotes/origin/Rami' into alex
**UNSTABLE** Intermediate checkin.
All the values now live in the weapon