Merge branch 'master' of git://github.com/isenseDev/rSENSE
Merge branch 'master' of git://github.com/isenseDev/rSENSE
Merge branch 'master' of git://github.com/isenseDev/rSENSE
-Made isotope items clickable and then removed the project/ruroial/vis link in favor of making that the clickable.
-Fixed project tests.
Here's the image.
Merge pull request #980 from NatTuck/kill-amazon-phase-1

Here's the image.
Give skittles his nil thumbnails for vis.
Merge pull request #981 from NatTuck/kill-amazon-phase-1

Give skittles his nil thumbnails for vis.
Merge pull request #979 from mmcguinn/mm977

-Made isotope items clickable and then removed the project/tutorial/vis link in favor of making that the clickable.
-Made content boxes get focus when hitting the green plus.
-Empty content should not properly trigger green plus images instead of blank contents.
Initial changes to field editing. No longer done within the projects page.
A few more modifications and removing javascript
Now we're on Rails 4.
Initial swap to new file field templating
Clean up some tests.
Merge pull request #982 from mmcguinn/mm952

Content box changes
Merge branch 'master' of https://github.com/isenseDev/rSENSE into rails-4
Clean up tests - skip stuff Jim is breaking.
Added ability to save dataset on creation of fields from template file