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
[misc] Create a base-war module which can be used for tests
[misc] Forgot to stage a few deleted files
Issue #1051: Make the build work on Maven 3.1 and 3.2
The build works, but verbose logs are displayed when building the hsqldb-database module
[misc] Improve the aspect of the delete button in the attachment picker
Issue #1027: Certain images fail to be processed by the attachment picker
.jpeg files now work
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
Issue #1029: fix incorrectly failing date comparisons when setting patient death date in pedigree
[misc] Adding snapshot plugin repository configuration in order to find the phenotips-packager-maven-plugin
[misc] Workaround flickering test failures
Merge pull request #1017 from phenotips/issue-1016

Issue #1016: Expose more data through the Patient API/JSON
Issue #1055:  Pedigree image aspect ratio does not match the actual pedigree's aspect ratio

Fixed the width and height of the generated SVG.