typo
html
Merge remote-tracking branch 'origin/master'

Conflicts:
	petstore-server/src/main/java/org/jacpfx/petstore/server/product/ProductVerticle.java
ProductVerticle
Constants
update Shop
Shop Client
Shop Client
update
update
Merge branch 'master' of https://github.com/amoAHCP/vertx-petshop
Merge branch 'master' of https://github.com/amoAHCP/vertx-petshop
Merge branch 'master' of https://github.com/amoAHCP/vertx-petshop
update
shop
Merge branch 'master' of https://github.com/amoAHCP/vertx-petshop