Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Adding delete and edit functionality for media, Delete row from dom after hiding
Adding pill boxes around redactor edit buttons
-Fixed stupid copypasta error preventing unix timestamps from working.
Merge pull request #469 from mmcguinn/unixTime

-Fixed stupid copypasta error preventing unix timestamps from working.
Changed the icons for the redactor panes to look more like buttons that are clickable.
Fixed bad class, Now removes hidden div from dom
Merge pull request #467 from jdalphon/updateProjectsPage

Updates to projects show page.
data sets now return their data with fields indexed rather than with their IDs
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
merge
made it purdier
Merge pull request #471 from nickavv/parachute

Changed Data Sets so that their data blob has its field keys indexed from 0 rather than keyed to field IDs
Fixed button merging
Merge pull request #470 from jdalphon/redactorEditButtons

Redactor edit buttons
Fixed giant noavatar problem
-removed user page dropdown links (#451)
Merge pull request #473 from mmcguinn/mm451

-removed user page dropdown links (#451)