Fixing anteprima details

Adjusting anteprima, fixing tab names an text Shape
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/views/canvasView.js