looking at the formating of my other error messages to be consistant
Semi working
Removing a large chunk of logic from edit table upload
manual entry now fails gracefully if it cant save your data set
Addresses #1195.
- The polaroid tab is now height:100% with overflow scroll. This should
keep things from overflowing. Without doing something like isotope to
reflow the pictures, they will always fill in wierd if there are oddly sized
images.
It seems like all the ajax calls are in the right place now
Merge branch 'master' of github.com:isenseDev/rSENSE into hm_manual_entry_dataset_name
Removed the ability to rename a project on the manual upload page
Data set edit has been updated to work with the new manual entry
Fixed edit, it used to make the first column 90% of the size of the table
removed extranious logs and commented out code
Merge pull request #1198 from hmcq6/hm_manual_entry_dataset_name

Hm manual entry dataset name
Merge pull request #1199 from jdalphon/photostab

Addresses #1195.
Making the photos tab isotope.
Merge branch 'master' of git://github.com/isenseDev/rSENSE into photostab
Fixing terrible merge comflicts from other people
Merge pull request #1204 from jdalphon/master

Fixing terrible merge comflicts from other people
Merge branch 'master' of git://github.com/isenseDev/rSENSE into photostab
Add some name input fields.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into contributor-names

Conflicts:
	app/controllers/data_sets_controller.rb