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 origin/master