html updates
Merge branch 'client-dev' of https://github.com/theodi/colleen into client-dev

# By gavin
# Via gavin
* 'client-dev' of https://github.com/theodi/colleen:
  Deploy with json file data.
  Deploy with json file data.
  Deploy with json file data.