Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop