Epfl Widgets Pyramid Conversion
Merge branch 'overlays' of https://github.com/solute/pyramid_epfl into overlays