Commit 18ad2845 authored by Andrea Spiteri's avatar Andrea Spiteri

Merge branch 'demo1-recovery'

Recoverying demo1 state as refactoring has gone very wrong.
parents 7d184b30 1998829c