Fixes json deprecation warning: "DeprecationWarning: django.utils.simplejson is deprecated; use json instead."
Merge pull request #95 from Harvard-ATG/bchau_branch

Bchau branch
Merge pull request #94 from Harvard-ATG/bugfix/simplejson-deprecation

bugfix/simplejson-deprecation