AuditoriumLog.java commented
Merge remote-tracking branch 'origin/coderevision' into coderevision

Conflicts:
	votebox/VoteBox.java
AuditoriumLog.java commented
Merge remote-tracking branch 'origin/coderevision' into coderevision