places, generic form builder
Merge branch 'master' of https://github.com/pixelhumain/pixelhumain
Merge branch 'master' of https://github.com/pixelhumain/pixelhumain
Merge branch 'master' of https://github.com/pixelhumain/pixelhumain
clean up