fix using wrong id in lookup
Merge branch 'shock' of github.com:teharrison/MG-RAST into shock
Merge branch 'shock' of github.com:MG-RAST/MG-RAST into shock
Merge pull request #578 from teharrison/shock

fix using wrong id in lookup
fix qc stats processesing
Merge pull request #579 from teharrison/shock

fix qc stats processesing
fix default return type
fix drisee data download
Merge pull request #580 from teharrison/shock

more bug fixes on overview page
make doenload page work with shock
Merge pull request #581 from teharrison/shock

make doenload page work with shock
download page bug fixes
Merge pull request #582 from teharrison/shock

download page bug fixes
fix page layout text
Merge pull request #583 from teharrison/shock

fix page layout text
fix page layout text
Merge pull request #584 from teharrison/shock

fix page layout text
Merge pull request #585 from paczian/shock

AWE vs DB in Job progress
fix bp chart colors / order
Merge pull request #586 from teharrison/shock

fix bp chart colors / order