Added Javadocs in and removed unused imports/methods in more the controller classes.
Merge origin/master