Fixed an issue with loadrules2
Altered multisite filter
Only ask for posted deliveries when mulitiste is enabled
Re-introduced missing activities field to avoid deserialization issues
Added test for loadrules2
Finished test for loadrules2, made the Snapshot class testable
Trigger test
Merged master