Changed web app capabale
Merge branch 'dev' into beta