Extended site definition revision
Fixed issue in object defs
Made actor_id a base attribute of Event
Polished SiteExtension attributes
Polished xsaresources for devices
Merge commit 'cc24893'

Conflicts:
	objects/data/sa/xsaresources.yml
Merge pull request #380 from mmeisinger/fix_OOIION1010

Fix OOIION-1010 part 1