add new calculation model
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
coherence betw. statemachine and code
Merge branch 'master' of github.com:sbaechler/ParkingMeter into auswparkplatz
another change in the statemachine
coherence betw. statemachine and code
Implemented basic parking lot and parking spaces
another change in the statemachine
choose parking lot in ready state, add money to change to parking selected state. Only add mony in this state - not longer possible to change parking lot in this state
WIP not compiling - for MAB
Improved documentation
Now using cached version of parking lot
copy pasted from parkingTime refundMoney
cleanup states
update tests
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