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
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 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
Modifying tests to test new functionality
Resolving merge conflict
Maybe it passes tests now?
Changing id of form elements
clickable cards on home page, no hover effect on non-clickable cards, bold featured on project and vis indexes
made news index page pretty
Merge pull request #984 from nickavv/parachute

Prettification and consistencification
Styled the template page a bit
removed stray logger