Modified handleDrop function in drag.js to deal with case where block gets dragged into scratchpad.
Changed the handling of blocks in handleDrag
Tried to make the blocks stick in the scratchpad in the same place they were dropped. Doesn't work.
Got blocks to stay in the appropriate position when dropping over scratchpad.
Merge branch '416_new_ide_layout' of https://github.com/nikhilNathwani/waterbear into 416_new_ide_layout

Conflicts:
	dist/arduino.js
	dist/demo.js
	dist/javascript.js
	dist/minecraftjs.js
	dist/processingjs.js
	scripts/drag.js
Block's position in scratchspace is correct(?)
Got rid of alerts
Fixed: when dragging block B from workspace to scratchpad, workspace used to scroll around when B was moved in scratchpad
Merge branch '416_new_ide_layout' of https://github.com/nikhilNathwani/waterbear into 416_new_ide_layout

Conflicts:
	scripts/drag.js
Dealing with merge
Merge branch 'master' of https://github.com/nikhilNathwani/waterbear into 416_new_ide_layout
Trial push
resolve merge conflict