Edited upload page to require project edit rights on the project in their metadata spreadsheet before allowing a user to validate their metadata spreadsheet.
updated matrix resource, merged abundance[rpfile into it
Merge pull request #371 from paczian/master

fixed concurrency issue in search plugin
Merge branch 'develop' of https://github.com/MG-RAST/MG-RAST into develop
api: typo fix
api: merge analysisset and sequenceset resources -> download resource. seperated id into metagenome id and file id. option to pull file by id or name. option to view list of all or list of a stage
api: removed old annotation resource. merged sequence and similarity resource into new 'annotation' resource
api: inbox minor changes. dropped need of 'view' and 'upload' keywords. use method and auth to determine actions
api - matrix sort ids
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
api: added checking of invalid metagenome type combinations in matrix
api: fix in user resource auth checking
api: added POST ability to solr queries. added POST to m5nr resource for batch queries (GET is still for single query). pagination does not return urls using POST
Merge pull request #372 from teharrison/develop

API facelift
Editing MetagenomeSearch page to use solr.
Added Google Analytics and throwing error msg for unauthenticated auth token.  Also, changed error messages to json.
Syntax error fixed.
Editing MetagenomeSearch page to use solr.
Updated error message.
Editing search resource to return metagenome objects from solr.