add new calculation model
Merge branch 'states' into sz/maintenancestate
Merge branch 'master' into sz/maintenancestate
Merge branch 'master' into parkingCost

Conflicts:
	src/main/java/ch/zhaw/id5848/parkingmeter/core/ParkingCostManager.java
	src/test/java/ch/zhaw/id5848/parkingmeter/core/ParkingCostManagerTest.java
	src/test/resources/config/coinBoxes.xml
add missing coinbox
Improved code "quality" according to checkstyle
Moved XML configuration file names to constants
Name of the XML configuration file can now be injected (DI)
Merge branch 'master' of github.com:sbaechler/ParkingMeter into auswparkplatz
copy pasted from parkingTime refundMoney
First GUI implementet. Working. New methodes in controller for accesing the gui display.
Merge branch 'auswparkplatz'

Conflicts:
	src/main/java/ch/zhaw/id5848/parkingmeter/core/ParkingLot.java
Merge branch 'master' into parkingCost

Conflicts:
	src/main/java/ch/zhaw/id5848/parkingmeter/core/states/ReadyState.java
Merge branch 'master' into sz/maintenancestate

Conflicts:
	src/main/java/ch/zhaw/id5848/parkingmeter/core/ParkingMeterController.java
	src/main/java/ch/zhaw/id5848/parkingmeter/core/states/ReadyState.java
	src/main/java/ch/zhaw/id5848/parkingmeter/core/states/State.java
make tests pass
static getController
move parking space number to State
Logger und einige Log Statements hinzugefügt
testRefundMoney passed
doppeltes keypad entfernt