Merge branch 'master' of https://github.com/phenotips/phenotips into issue-597
Issue #597: Export database as JSON.
Merge branch 'master' into issue-597
[misc] Fixed a few issues
[cleanup] Improved comments and constant field names, fixed checkstyle error
Issue 597: Export database as JSON.
Fixed backwards compatibility issue.
Merge branch 'issue-597'. Export database as JSON.

Conflicts:
	components/patient-data/impl/src/main/java/org/phenotips/data/internal/controller/ClinicalStatusController.java
The conflict was resolved by checking out the controller from master.