testing code
Moving images to nodpi folder and fixing image drawing
minor clean up
Tidying Image drawing
Merge branch 'Image_test' into development