fixed error checking
fixed delete image
fixed add new link
Merge branch 'development' into john-dev