Actual images can be uploaded now.
Resolved conflicts.
Ruxi: Update client scripts.
Ruxi: Reordered the client folder.