Merge branch 'dev-app'
Merge branch 'dev-app' into master
index.html - markup for controls ui
Merge branch 'dev-app' into master
Merge branch 'master' into dev-app