Fixed and added javadoc comments.
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
Javadoc changes and fixings
Merge remote-tracking branch 'origin/team1-dev' into team1-dev