Fixed mediaelement. No more script tags in activities, required.
Fixed merge conflict, removed script tag again
Modified the texts for activity delete buttons for clarity
Merge branch 'master' of github.com:rtCamp/buddypress-media
Resolved Acitivity Upload error