Bug fixes
Merge remote-tracking branch 'origin/GUI_Branch_5-30-14' into BL_Branch_5-30-14
More bug fixes!
Merge remote-tracking branch 'origin/master' into BL_Branch_5-30-14
Merge remote-tracking branch 'origin/BL_Branch_5-30-14' into BL_Branch_5-30-14

Conflicts:
	drc/bl/drcbl.cpp
	drc/bl/stateupdate.cpp