Actual images can be uploaded now.
Resolved conflicts.