Merge pull request #328 from MG-RAST/develop

Security updates and modification of matrix resource in API.
Merge pull request #337 from MG-RAST/develop

Some bug fixes, especially important is the removal of HTML tag stripping when a variable is undef or numeric.
Merge pull request #340 from MG-RAST/develop

Fixed syntax errors on Registration page.
Merge pull request #341 from jaredbischof/develop

Changes to prevent job submission from failing and to let us know if job submissions do fail.
added sample legend to phylo tree
added drilldown for functional trees
added drilldown for functional trees
Merge pull request #342 from paczian/master

analysis page treeview upgrade
Merge pull request #343 from MG-RAST/develop

Edits to stop subset of job submissions from failing and added drilldown for functional trees
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