render package.json
Merge branch 'artemis'

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