updates to app0 added
Merge branch 'develop' into staging