Image uploading functionality added
Merge origin/development into development