fix
Merge branch 'master' of github.com:PSD-RTS/simple-petstore-avengers

Conflicts:
	webapp/src/test/java/test/unit/org/testinfected/petstore/controllers/PlaceOrderTest.java