added edit functionality
Merge branch 'editobject' into develop