Merge pull request #1204 from jdalphon/master

Fixing terrible merge comflicts from other people
Merge branch 'mediaupload' of github.com:jdalphon/rSENSE into mediaupload
- Dont put media objects without users on the list
- Putting a media objects view on the visualizations page