Fixed bugs in context
Merge branch 'upload-refactor' of https://github.com/rtCamp/buddypress-media into upload-refactor