minor edit for testing
fixed small image size upload bug
fixed render.html
Merge branch 'master' into colorbar
added text caption