Fixed bug that imaging snapshots were not showing any more.
Org improvements.
Fixed org triggers.
Merge branch 'test' into dev
merge.