02: HATEOAS is an acronym, not an abbreviation - doh!
Merge branch 'master' into gh-pages