Merge pull request #328 from MG-RAST/develop

Security updates and modification of matrix resource in API.
Merge pull request #335 from wilke/master

Query caching and cleanup
fix metagenome query with anonymnous user
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Added code to prevent undef perl variables from being converted to empty strings by HTML::Strip when entering them into a database in PPOBacken.pm.  Also, skipped the HTML stripping if the variable looks like a numeric value.
Merge pull request #336 from jaredbischof/develop

Added code to prevent undef perl variables from being converted to empty...
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.
Fixed syntax errors on Registration page.
Merge pull request #339 from jaredbischof/develop

Fixed syntax errors on Registration page.
Merge pull request #340 from MG-RAST/develop

Fixed syntax errors on Registration page.
Edited usage of whitespace replacement to only be performed when inputting variables into job attributes table.  Otherwise, metagenome_name can be erroneously changed altered and cause job submission to fail.
Added error checking so that if add_valid_metadata function returns an error during job submission, the webpage tells the user about the error and sends the error message and job numbers to mg-rast rt system.
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
fix qiime export
Merge pull request #349 from teharrison/master

fix qiime export