Simplify configuration options
Merge branch 'master' into hdiv-hateoas
Add hdiv state using spring-hateoas api instead of reflection.