Trying fix bomb position
Fixing bomb position
Merge branch 'bomb_position' of https://github.com/Vtnt-UnB/real-time-mapping into bomb_position

Conflicts:
	django_service/vtnt_database/operation/OperationalController.py
	django_service/vtnt_database/operation/map.py
	django_service/vtnt_database/vtnt_database/static/images/map.png