Added and edited javadoc for all controller classes.
Fixed merge conflicts.