lolz
Merge remote-tracking branch 'origin/GUI_Branch_5-30-14' into GUI_Branch_5-30-14

Conflicts:
	drc/DRCClient.cpp