Tooltips fixed for the blocks
Conflicts fixed
Merge remote-tracking branch 'origin/newbranch'

Conflicts:
	Functions.js
lines working better, but still jumps while dragging boxes