Revert to time when Ernest put his activity diagrams
Merge branch 'refs/heads/merge-activities'