Updated role and info controller javadoc
Merge remote-tracking branch 'origin/master'