Merge branch 'master' of https://github.com/joshuaabenazer/buddypress-media
Merge branch 'master' of https://github.com/joshuaabenazer/buddypress-media
fixing admin overwrite git error
Pulled joshua's and Faishal's code
commit before pulling faishal's repo
Albums and Media refactored. Upload's broken. Activities still broken
Merge pull request #85 from yapapaya/master

Major code refactor
Fixed activity feed and uploads
Merge pull request #86 from yapapaya/master

Fixed activity feeds and uploads
refactored file structure and deleted some more unnecessary files
More refactoring, moved template functions
More refactoring, widgets refactored
added empty index.php to some folders
Merge pull request #89 from yapapaya/master

More refactoring
some more refactoring
rearranged more files and folders, moved all libraries to lib
Merge pull request #90 from yapapaya/master

Rearrangement of files
Fixed Widgets
Added po file. Made some more changes
Merge pull request #91 from yapapaya/master

More code refactor, added translation support