Merge pull request #220 from jaredbischof/develop

More edits to upload.cgi
catched error when returning empty matrix data
Merge pull request #221 from teharrison/develop

catched error when returning empty matrix data
fix error in retrun type
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
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
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop