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

Conflicts:
	solute/epfl/fields.py