AEROGEAR-878 "Update Controller JavaDocs"
Merge branch 'danbev-AEROGEAR-878-controller-javadocs'