Merge branch 'dev' into thy
floating windows now usable
Merge branch 'thy' into dev