AppId check for UserApp
Merge branch 'master' into Bootstrap