merging NON STABLE dev into master

[dreais]

• da3d80c is the most important update, please see for a somewhat stable version
• refactoring function to resize and add windows in progress