some templatechanges
Merge remote-tracking branch 'origin/fabian'
BalanceController initializer()
Merge branch 'master' into julian
Fixed Rent (id)
Merge branch 'master' of https://github.com/C0nsultant/swtp-rebuild
Method for florian
Serialized bill
Merge branch 'master' of https://github.com/C0nsultant/swtp-rebuild
added option for creating camper/booking
Rent now fully works
WIP on Bills
Merge branch 'fabian' of https://github.com/C0nsultant/swtp-rebuild into fabian

Conflicts:
	src/main/java/de/tudresden/inf/swt14w31/ordermanagement/BookingController.java