Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST
Fixed syntax error.
Fixed another syntax error.
Merge pull request #198 from jaredbischof/develop

Syntax errors fixed on Manage Preferences page.
Don't need to verify output file before it's created, and don't need to verify file "none" because it doesn't exist.
Merge pull request #199 from jaredbischof/develop

Fixed error where trying to validate empty files in paired end joining.
fixed bad array assignment
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge branch 'master' of git@github.com:MG-RAST/MG-RAST
fixed bad array assignment
Merge pull request #200 from teharrison/master

hotfix for analysis page bug
Merge pull request #202 from MG-RAST/master

merge of prod hotfixes with develop branch
Merge pull request #201 from paczian/master

api feature additions, project resource rights fix
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
updated metagenome_statistics resource: now uses analysis.pm to pull from job dir, restructered output into groups of similer stats, now returns all pipeline sequence stats (JobDB:JobStatistics)
Merge pull request #203 from teharrison/develop

update of metagenome_statistics
metagenome_statistics resource: added verbosity levels, added more qc output to make our stat people happy
Merge pull request #204 from teharrison/develop

metagenome_statistics resource: added verbosity levels, added more qc ou...
fixed workbench table bug
fixed workbench table bug