Commit for merge
Merge branch 'upload-refactor' of github.com:rtCamp/buddypress-media into upload-refactor