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 pull request #1 from mmcguinn/mm326

Mm326
made search on contributions wider
Merge pull request #355 from jdalphon/location

Map Picker
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
Edit table now populates with saved data, if its saved to the correct data format
Merge branch 'master' of http://github.com/isenseDev/rSENSE into HM_Load_Data_Edit_Table
Merge pull request #356 from hmcq6/HM_Load_Data_Edit_Table

Hm load data edit table
Changing the link to go to a data_sets edit page. Hassan will be moving editTable to the edit page to make this work.
Merge pull request #358 from jdalphon/jd_issue357

Fixing edit link on data set
Edit table now stores and pulls back data in the new format. YAYgit status! also editTable.html was moved to edit.html
removed extranious tacos
Merge pull request #359 from hmcq6/HM_Fix_Data_Format

Hm fix data format