Fix web app import
Update readmes
Merge branch 'develop'