Merge pull request #349 from teharrison/master

fix qiime export
initial version of oauth2 with shock suppport
minor fixes
dump script for m5nr to solr
optimization: reduce perl memory footprint when doing SQL queries
Merge pull request #2 from teharrison/master

merge back
Merge pull request #353 from teharrison/develop

optimization: reduce perl memory footprint when doing SQL queries
Merge pull request #354 from jaredbischof/develop

Edited HTML Strip call in WebApplication.pm to only perform strip on scalar inputs (or scalar...
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
Merge branch 'master' of github.com:MG-RAST/MG-RAST
added option to turn off recaptcha
added Register2 so the registration page can be checked by a bot
Merge pull request #355 from paczian/master

added oauth2, added register2
field name changes
use solr for m5nr api
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge pull request #356 from teharrison/develop

use solr with m5nr
m5nr api: update config variables, update usage
Merge pull request #357 from teharrison/develop

m5nr api: update config variables, update usage
fix md5 check bug
Merge pull request #358 from teharrison/develop

fix md5 check bug