Added missing Javadoc comments to animation pkg.
Edited some controller files to meet checkstyle standards.
Merge remote-tracking branch 'origin/master' into james/dev
Merge branch 'master' into jack/dev
Added Javadocs in and removed unused imports/methods in more the controller classes.
Merge origin/master
Merge branch 'master' into jack/dev