update html to bootstrap fluid-grid system
Merge branch 'master' into artemis

* master:
  copy fields.html.twig
adjustments to twitter bootstrap html
update form html
Merge branch 'artemis'

* artemis:
  update form html
  adjustments to twitter bootstrap html
  update html to bootstrap fluid-grid system