pre-merge commit.
Merge remote-tracking branch 'origin/master'
pre-merge commit
Merge remote-tracking branch 'origin/master'

Also tried to fix AI bar issue... we're getting there.

Conflicts:
	src/edu/drexel/psal/anonymouth/gooie/DriverEditor.java
	src/edu/drexel/psal/anonymouth/utils/ConsolidationStation.java
Pushed fix for anonymity bar (two functions in taggeddocument)