soft delete
Merge remote-tracking branch 'origin/master'

Conflicts:

	SimpleBlogClient/build/generated-sources/jax-ws/org/chamerling/heroku/service/HelloService.java

	SimpleBlogClient/build/generated/jax-wsCache/HelloService/org/chamerling/heroku/service/HelloService.java
	SimpleBlogClient/build/web/index.xhtml
	SimpleBlogClient/web/index.xhtml