Writing tests for 1.18
Merge tag '1.18' into COMPOR

Conflicts:
	src/main/java/br/ufpb/dce/aps/coffeemachine/CashBox.java
Task 1.18 finished for COMPOR