* partially implemented incident loading
* company variables and ranges defined at a single location
Merge remote-tracking branch 'origin/master' into master-real
Merge remote-tracking branch 'origin/master' into master-real