Init App content
Merge branch 'App'