Compatible with bootstrap 3 and pyramid 1.5
PEP8 / Whitespace change
Use internationalization machinery
Merge branch 'i18n'

Conflicts:
	fa/bootstrap/templates/forms/fieldset.pt
	fa/bootstrap/templates/forms/grid_readonly.pt