Merge branch 'simple-improvements' into 'develop'

Adding analytics and tracking code for demo-mode

See merge request !16