Conflict fix?
Merge remote-tracking branch 'upstream/dev' into dev
Conflict fix. Again.
Removed the (empty) medkits from ERT backpacks
Camera mapping.
Robotic cameras.
Robotic cameras again.
Camera networks.
Alarm cameras.
Merge pull request #3371 from Kilakk/dev

Fixes #3368 - Removed the (empty) medkits from ERT backpacks
Cameras for strike teams.
Changelog.
Merge pull request #3372 from Segrain/dev

Cameras update.
Merged setup.dm.
Manual map merge.