Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
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
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
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
Merge pull request #623 from mmcguinn/scratch

-Added link back for #567
Fix for issue #611
Merge pull request #622 from jdalphon/uploadMediaButton

Added the can_edit check to the upload media button
Merge pull request #624 from jdalphon/jd_issue611

Removed outer button tag
Only admins can create tutorials
Tableized the visualizations panel on the projects page