Replacing AeroGear controller Javadoc style
Merge branch 'controller'