Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
added support for 'represtative hit' and 'lca hit' in organism matrix
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge pull request #268 from jaredbischof/develop

Added inbox resource to new API.
Merge pull request #267 from teharrison/develop

added support for 'represtative hit' and 'lca hit' in organism matrix
fixed missing output attribute
Merge pull request #269 from teharrison/develop

fixed missing output attribute
Merge branch 'develop' of https://github.com/MG-RAST/MG-RAST into develop