Resolved js and css cachiong issues by adding plugin version
Resolved COnflicts
Modified screenshots
Merge branch 'master' of https://github.com/joshuaabenazer/buddypress-media
Fixes issues due to js and css being cached"