Merge pull request #323 from teharrison/develop

removed insane dash propigation
added HTML stripping and mySQL quoting for user supplied strings
fixed array handling of html stripper
fixed array handling of html stripper
Merge pull request #324 from paczian/master

security patch for oAuthPPO.cgi
api: add taxid to matrix output
api: added taxid output option to matrix, fixed taxonomy list in single mode
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop