street n city
Merge branch 'master' of
https://github.com/PSD-RTS/simple-petstore-avengers

Conflicts:
	domain/src/main/java/org/testinfected/petstore/billing/Address.java
	webapp/src/main/java/org/testinfected/petstore/views/Checkout.java
Merge branch 'master' of https://github.com/PSD-RTS/simple-petstore-avengers