FIxed bug in editor, remove object, fixed buttons, positions and css
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/Scripts/editor.js