Added changes to the dropZone, and created the ability to deactivate and reactivate items in the block palette
resolved merge issues in snowPlusPlus.cpp