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
Sort Fields model so that lat lon always come out last
Added all map stuff to Hassans plugin. Every row now has its own map that wont interfere with the others
turned off debugging on hassans plugin
Merge pull request #354 from hmcq6/HM_Sort_Fields_Lat_Lon

Sort Fields model so that lat lon always come out last
Merge branch 'master' of git://github.com/isenseDev/rSENSE
adding map picker to edit table and fixing namespace issues
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