Merge branch 'develop'
moved demo to demo folder.
Merge branch 'master' into develop