JavaDoc added for methods in several classes

JavaDoc completed for the following classes:
Admin
DatabaseController
CabinDatabaseController
merge Herman's into master