Added public/uploads to list of shared folders, added db/schema.rb
changes
Merge branch 'release-1.1.1' into develop