upload folder layout added
entire image uploaded to database
merge conflicts in uploadimage.jsp fixed