Merge branch 'NotSoFlat-dev' into dev

* NotSoFlat-dev:
  NotSoFlat: Initial import
Merge branch 'NotSoFlat-dev' into dev

* NotSoFlat-dev:
  NotSoFlat: documentation update and icon
  NotSoFlat: documentation update and icon
Merge branch 'NotSoFlat-dev' into dev

* NotSoFlat-dev:
  NotSoFlat: more tweaks
  Tweaks
  NotSoFlat: bugfixes and api tweaking