Merge branch 'master' into add-registration-total

Conflicts:
	src/main/java/org/cru/crs/api/model/Registration.java
	src/main/java/org/cru/crs/api/process/PaymentProcessor.java
Two of the most trivial conflicts ever -------^  I would expect this of SVN, not Git :)
Missed refactoring injectable services in `RegistrationResource`
Merge pull request #81 from CruGlobal/add-registration-total

Add two new fields to registration
Merge branch 'master' into error-handling

Conflicts:
	src/main/java/org/cru/crs/api/RegistrationResource.java
	src/main/java/org/cru/crs/api/model/Registration.java
	src/main/java/org/cru/crs/api/process/PaymentProcessor.java