Merge branch 'master' of github.com:isenseDev/rSENSE into mm326
-Fixed issue I introduced where deleting fields would instead delete the experiment.
-Removed some unused media object views.
-Added mediaObjects#update back in, also made a real show page that allows name editing and deletion.
Merge branch 'master' of github.com:isenseDev/rSENSE into mm326
-Finished getting dataset list to line up properly. Still need to fix some inline CSS and it collapses badly.
Merge branch 'master' of github.com:isenseDev/rSENSE into mm326

Conflicts:
	app/models/media_object.rb
-removed logger.info call.
Merge branch 'master' of github.com:isenseDev/rSENSE into mm326

Conflicts:
	app/controllers/visualizations_controller.rb
	app/views/projects/show.html.erb
Merge pull request #362 from mmcguinn/mm326

I'm a dumb.