Fix NPE on create conference by making sure Lists/Sets are always initialized for API objects which have a collection of other objects.  Prevents NPEs
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 :)