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.
made search on contributions wider
added newer webrick to gemfile so that warning messages go away. run bundle install and restart server to get fix
Merge branch 'master' of https://github.com/isenseDev/rSENSE into wigglybranch
started making disabled vises pretty
Merge branch 'master' of https://github.com/isenseDev/rSENSE into wigglybranch
fixed image path
adding a way to edit the name of a data_set in edit table
all disabled vises are beautiful (objectively)
Merge branch 'master' of https://github.com/isenseDev/rSENSE into wigglybranch
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.
Made buttons for picking time and location part of the inputs, Added a datetimepicker
Merge branch 'master' of git://github.com/isenseDev/rSENSE into editTheEditing