Tag incident for sending alerts
Tag incident for sending alerts
Major renaming
Merge branch 'dev' into cegss

Conflicts:
	inventorymanagementviasms/hooks/inventorymanagementviasms.php
re-added lost municipality info
changed readme website
Revert "re-added lost municipality info"

This reverts commit 5d0fde45b1f2b38cb5017beadbd4072634bf2758.
Merge branch 'dev'

Conflicts:
	Inventory Management via SMS/i18n/es_ES/smsautomate_ui.php