Final merge before demo 1

See merging branch for comments.