Resizable object1 and editable content
Merge branch 'master' of https://github.com/nmcalabroso/BuildEx

Conflicts:
	application/controllers/builder.php