fixed empty cart test handling
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/src/test/java/test/unit/org/testinfected/petstore/controllers/ShowCartTest.java
Merge remote-tracking branch 'origin/master'
fixed all bugs and flaws