factor additional expenses in total calculations
Add description to payment

Conflicts:
	src/main/java/org/cru/crs/api/model/Payment.java
spacing