added android/ios buttons to the homescreen mobile layout
Skipped authorization for data_set export and media show.
Merge remote-tracking branch 'upstream/master' into jp735
Merge remote-tracking branch 'upstream/master' into jp735
Updated functional tests for data sets so that manualUpload is performed.
Merge remote-tracking branch 'upstream/master' into jpUploadDataTest
Merge remote-tracking branch 'upstream/master' into jp735
Merge pull request #789 from jdalphon/generalChanges

Yet another bug with postgres
Merge pull request #790 from jaypoulz/jpUploadDataTest

Updated testing so that it performs a valid manualUpload test.
Merge remote-tracking branch 'upstream/master' into jp735
Merge pull request #780 from jaypoulz/jp735

Skipped authorization for data_set export and media show.
fixed Issue #732, changed 'Experiment Field' to 'Project Field' on CSV upload
Adding spacing between Cancel Upload and Finish buttons on dialogue box for matching CSV headers.
fixed merge conflicts
moved styling into home CSS file
made tests not fail
added content output on project to_hash, print first paragraph of content on mobile homepage featured project
Export now hands you a zip instead of one giant file
Merge branch 'master' of http://github.com/isenseDev/rSENSE into HM_CSV_Names
Initial removal of redactor and addition of ckeditor