Image insertion mostly done-ish
mergedfrommaster
Merged again from master
my changes DON'T MERGE
catchup
Merge remote-tracking branch 'origin/master' into brian

Conflicts:
	client/css/minimap.css
css rearrangement
Merge remote-tracking branch 'origin/benV2' into brian

Conflicts:
	client/index.html
	client/js/Canvas.js
	client/js/UI.js
	client/js/Wobject.js
	client/js/toolbartest.js
Merge branch 'brian' of https://github.com/benzenittini/azosc into brian
minor visual tweaks