Last changes

Image recommented in the mail template - disabled the resizable function
in builder js
Merge remote-tracking branch 'origin/JS-Assets-(image-upload-working)' into JS-Assets-(image-upload-working)

Conflicts:
	builder2.html