telefonicaid/fiware-orion — pull request #528 by kzangeli (2014-09-10 10:54:02+00:00)
Title: Merge/with develop

### Description
Merging develop into feature/499_basic_ctx_providers before feature/499_basic_ctx_providers is merged into develop ...