MEDIATION TABLE!!

Goes in here! (quick commit to get to real branch)
Merge remote-tracking branch 'origin/DB_Branch_6-25-14' into DB_Branch_6-25-14

Conflicts:
	drc/db/drcdb.cpp
	drc/db/drcdb.h
(think i fixed my conflicts...)