Starting to make a file upload api
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fileupload
More work towards non-ajax csv upload
added favicon
Re-integrating google docs.
Merge branch 'fileupload' of github.com:jdalphon/rSENSE into fileupload
Added a to_csv function to the dataset model. This will be useful for export (which is being redone next)
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fileupload
Merge branch 'fileupload' of github.com:jdalphon/rSENSE into fileupload
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Add notice and alert flashes to the application layout.
made news box and statistics box on home screen pretty
Cleaned up the exporting process, fixed a bug that may never have actually been found
Merge branch 'restore-ui-flash' of https://github.com/NatTuck/rSENSE into fileupload
merge problem
Final changes to flashes before pull
Merge pull request #968 from nickavv/parachute

Favicon and New Homescreen Panels improved
Fixing tests to suit new csv upload system
Trying to get travis to run again
Damn ICONV was deprecated in ruby 2.0.0