Got image upload to work, but they are not yet being saved to the server.
Merge branch 'c1moore_branch' into dev