Merge branch 'master' into weaponsbranch

This reverts commit b900b94e0abd5519b41f2417b69fa0678a617a10.

Conflicts:
entities/map.js