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 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
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
Merge pull request #1206 from jaypoulz/jpSessionsBranch

Tweak the login view form so that its takes only an email now, and updated the sessions controller to only take email.
Merge pull request #1201 from jdalphon/photostab

Making the photos tab isotope.
Merge pull request #1207 from NatTuck/contributor-names

Contributor names