Added window layout save for Issue 25
Merge branch 'develop' into feature/technicallyerik-wip