add application and window
correct
Merge branch 'feature/app' into develop
added layout
fixed merge
Merge branch 'release/0.1.1'