Save-upload functionality
Merge branch 'Reach' of https://github.com/pboyer/flood into save-upload

Conflicts:
	app/scripts/models/nodes/CodeBlockNode.js
	app/styles/main.css
take into account that needed workspace may be already loaded. Check out WorkspaceBrowser as well
weird merge of main.css file
Merge branch 'Reach' of https://github.com/pboyer/flood into save-upload

Conflicts:
	app/scripts/models/nodes/CodeBlockNode.js
	app/scripts/models/nodes/Node.js
Merge branch 'Reach' of https://github.com/pboyer/flood into save-upload

Conflicts:
	app/app.html
	app/scripts/models/SocketConnection.js
nice icons, remove proxy node marker, rename buttons
Merge branch 'Reach' of https://github.com/pboyer/flood into save-upload
Merge branch 'Reach' of https://github.com/pboyer/flood into save-upload

Conflicts:
	app/app.html
	app/scripts/models/App.js
	app/scripts/models/Workspace.js
	app/scripts/views/AppView.js
	app/scripts/views/NodeViews/CodeBlock.js
clear old geometry
nwk save-upload; move save-upload related stuff into separate files
Remove scrollbar in search
Merge pull request #50 from pbidenko/Search

Remove scrollbar in search
Merge pull request #33 from marimano/save-upload

Save-upload functionality
Merge branch 'Reach' of https://github.com/pboyer/flood into Reach

Conflicts:
	Gruntfile.js