Issue #1016: Add more controllers to the patient class.
Fixed problems with JSON
Merge branch 'orion-gene-controller' of https://github.com/phenotips/phenotips into issue-1016

Conflicts:
	components/patient-data/impl/src/main/java/org/phenotips/data/internal/controller/AbstractComplexController.java
	components/patient-data/impl/src/main/resources/META-INF/components.txt
Merge branch 'master' into issue-1016
[misc] Fixed merge conflicts
[misc] Added missing import, which was causing the build to fail
[cleanup] Applied codestyle
[cleanup] Removed constant from the wrong interface
Issue #1016: Expose more data through the Patient API/JSON
Rewrote the APGAR controller to output integers instead of strings
[misc] Fixed a few compilation warnings
[misc] Workaround flickering test failures
Merge pull request #1017 from phenotips/issue-1016

Issue #1016: Expose more data through the Patient API/JSON