My code was indented badly. Fixed it.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into UIfixes
tooltips
Making the photos tab isotope.
Merge branch 'master' of git://github.com/isenseDev/rSENSE into photostab
Merge pull request #1204 from jdalphon/master

Fixing terrible merge comflicts from other people
Merge branch 'master' of git://github.com/isenseDev/rSENSE into photostab
Adding a media upload box to the display_vis page. Also making sure that only images ever make it to the visualizations tab
Merge branch 'mediaupload' of github.com:jdalphon/rSENSE into mediaupload
Add some name input fields.
- Dont put media objects without users on the list
- Putting a media objects view on the visualizations page
Merge branch 'master' of https://github.com/isenseDev/rSENSE into contributor-names

Conflicts:
	app/controllers/data_sets_controller.rb
-Hopefully fixed ckEditor not respecting assets.
Merge pull request #1205 from mmcguinn/mm1151

-Hopefully fixed ckEditor not respecting assets.
Contributor name for manual entry.
jpSessionsBranch
Merge remote-tracking branch 'upstream/master' into jpSessionsBranch
Update test to submit name with file upload.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into contributor-names
Fixed tests to work with new session controller