Commit 2017-02-17 testing
Finish demo app