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
Deleted several files still with 'experiment' or 'experiments.' Added two new files with 'project' and 'projects.'
Merge branch 'master' of https://github.com/isenseDev/rSENSE into testing3
Deleted 2 files with improper name convention. Created new file with correct name convention. Added several unit tests. Fixed a small error in the media_object models file.
Merge pull request #338 from kcarcia/testing3

Deleted files with improper name convention and added files with proper name convention
-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