add application and window
correct
Merge branch 'feature/app' into develop