first upload speed commit
Merge branch 'master' into upload-speed

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
upload-speed
changed user avatars to carrierwave to check speed