Fixed up status bar and bottom bar issues in demo app
Merge branch 'develop' of github.com:usersource/anno into develop