Flat layout
Merge branch 'master' of https://github.com/staix/Addon.git