Merge remote-tracking branch 'origin/ClassStuff' into Workspace---Nodes-and-Lines

Conflicts:
	mockup.css
	mockup.html
	mockup.js
Merge remote-tracking branch 'origin/master' into InDev

Conflicts:
	mockup.css
	mockup.js
Backups
Revert "Backups"

This reverts commit c52457b9089a95d50c44edad0da0013aa1755c91.
Added the "variables" to each entity and follows the dragable
Added jeditable and the errors it comes with
Fix for an undefined variable used for inVar and outVar.
some small edits to jeditable
Merge branch 'Propertysheet' of github.com:Poelsa/TheNarrator into Propertysheet

Conflicts:
	mockup.js
portOut edit
Merge branch 'Propertysheet' of github.com:Poelsa/TheNarrator into Propertysheet
Updated so not only the outPorts were editable, but also the inPorts
css fixes for sidebar elements, ports for input
trying to fix the curves
Merge remote-tracking branch 'origin/newbranch'

Conflicts:
	Functions.js