Merge pull request #222 from teharrison/develop

minor fix to m5nr api
Merge branch 'master' of github.com:MG-RAST/MG-RAST
fixed star rights handling
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
fixed star rights usage
Merge pull request #223 from paczian/master

fixed star rights handling in abundanceprofile
Updated sequences resource to return a better structure.  Also, changed options to include a data_type and an annotation field where the annotation field replaces all three fields organism, function, and ontology.  Instead the data_type that is defined determines what type of input is in the annotation field.
Fixed a couple bugs that were causing the MetagenomeOverview page to come up blank if the taxonomy stats were missing.  Also, changed the return structure of the sequences resource by editing md5_abundance_for_annotations, sequences_for_md5s, and sequences_for_annotation.  And, edited _get_annotation_map so it will return the md5 int to md5 string mapping.
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Merge pull request #224 from jaredbischof/develop

Fixed/updated sequences resource and fixed bugs.
Fixed url that was returned by resource in return structure.  Also, added error message for when md5s are entered but none are found in the database.  And, changed the behavior.  Before if no md5s were sent in md5s_to_read_sequences call, all sequences were returned.  Fixed this by doing a check before making that call.  Lastly, included only valid md5s in returned url.
Merge pull request #225 from jaredbischof/develop

Fixed url that was returned by resource in return structure.  Also, adde...
added evalue, identity, length cutoffs for api matrix and abundanceprofile. added option to filter matrix returns by opposing annotations
merged conflicts