Merge pull request #2 from MarcosFino/master

Added site_info fields to customize entity_proposal template
Allow html in form texts, and some cleanup