Fixed minor merging conflicts

Renamed COMMAND_TYPE to CommandType for all Menu states. Still need to
include missing exception classes from Database stuff.