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.
Issue #1243: New visibility level: "open" granting edit rights on a patient record for all authenticated users
Renamed "openCollaboration" to simly "open"
+ added tests
Issue-#1259: Clearing a date from the datepicker on the Browse All Data page scrolls the browser back to the top. ALSO fixed similar problem for the today button.
Issue-#1259: Clearing a date from the datepicker on the Browse All Data page scrolls the browser back to the top. Also fixes similar issue for the today button.
Issue #1261: Rejected genes controller
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.
Issue #1184: Added "adopted out" option to pedigree nodes and changed adopted in line graphic to conform with standard
Merge pull request #1266 from mjshepherd/Issue-#1261

Issue #1261: Rejected genes controller
Merge pull request #1262 from mjshepherd/Issue-#1259

Issue-#1259: Clearing a date from the datepicker on the Browse All Data ...
Issue #1248: Candidate Genes don't have the list of links to related websites anymore
Fixed