Merge branch 'current' into ratjens
Revert "remove annotying case clashes on form submit buttons by overriding simple form default"

This reverts commit e07810800812cfc4f80e1083103e56f3d3efa467.
Merge branch 'current' into ratjens
allow overriding of form headings in modal pop-ups
localize form submit buttons
addf some more icons for users
provid a form builder help to just display some text in a form
tidy up ResourcesHelper
Merge pull request #134 from marketboomer/ratjens

provide a form builder help to just display some text in a form