Merge branch 'master' into DB_Branch_6-10-14

--Amend: Needed to remove some duplicate lines that
	 were missed by the mergetool.

Conflicts:
	drc/drc_shared/mediator/MediatorKeys.h
Merge branch 'DB_Branch_6-10-14' of https://github.com/lansdon/cpts483_drc into DB_Branch_6-10-14