Merge branch 'develop'
Merge branch 'develop'
remove webapp from xinit
Merge branch 'master' into develop