Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Skittles broke header matching by adding the field type to the top of the manual entry table. This brings up lots of issuse, so I changed the header matching to work based on id instead of name
Saving all changes thus far. About to completely revamp fields
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fieldsTable
Checking something for skittles
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fieldsTable
Commiting so i can check the less error i was getting on my laptop
added deletion of fields to the new fields box
merge conflict
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Adding, deleting, renaming, saving of fields all work. This does not include field reordering
-Fiddled with the type detection and message for #603.
Revert "Copyedit to /users/show.js.coffee. Addressed #557 in projects/index.js.coffee and models/project.rb. Removed code from manualEntry.html.erb regarding units which broke everything. #589 has be reopened."

This reverts commit fe2a71f2e8475d9aef92ef07963fc9a92b6b3cae. (for #589)
-Added units to edit table headers.
Merge branch 'HM_Upload_By_ID' of git://github.com/hmcq6/rSENSE into scratch
-Also fixed #589

Conflicts:
	app/views/data_sets/edit.html.erb
Merge pull request #620 from mmcguinn/scratch

Scratch
Added some more features to the fields box
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fieldsTable
Merge pull request #621 from jdalphon/fieldsTable

Fields table
Added the can_edit check to the upload media button #571