update to for new shock return structure, added M5NR api resources into mgrast 'm5nr' resource
Merge pull request #344 from teharrison/develop

update to for new shock return structure, added M5NR api resources into mgrast 'm5nr' resource
fixed level display in drill down of functional tree
fixed error log spam
added reviewer access
Merge pull request #345 from paczian/master

reviewer access & minor patch analysis tree
api: fix info format for m5nr resource
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge pull request #346 from teharrison/develop

api: fix info format for m5nr resource
fix wrong variable name
Merge pull request #347 from teharrison/develop

fix wrong variable name
fixed copy paste bug
Merge pull request #348 from paczian/master

fixed MetagenomeProject
fixed grouping off by one error for representative hit
Merge pull request #351 from paczian/master

representative hit grouping error
Merge pull request #1 from teharrison/master

missing master code merged back
Merge pull request #352 from teharrison/develop

fix qiime export, add notebook publish
initial version of oauth2 with shock suppport
minor fixes
Merge pull request #2 from teharrison/master

merge back