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.
adding a way to edit the name of a data_set in edit table
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
Merge pull request #363 from jdalphon/editTheEditing

Changes to editTable
Added timeout to check if fields have been added so you can add data
Removed console.log
Changed 'obj.owner.owner' to 'obj.owner.owner.id'
Fixed bug that would remove values in edit table
Merge pull request #365 from hmcq6/HM_Fix_Can_Edit_Fields

Changed 'obj.owner.owner' to 'obj.owner.owner.id'
Merge pull request #366 from jdalphon/editTheEditing

Fixed bug that would remove values in edit table
Merge pull request #361 from nickavv/wigglybranch

Made disabled vises look awesome