telefonicaid/fiware-orion — pull request #360 by kzangeli (2014-05-08 20:17:58+00:00)
Title: Task/feature 322 merged with develop

### Description
Merged develop into the feature/322 branch.
All changes were revised before they were merged into develop, so, no special care is needed for this PR - but at least, have a look at the list of commits.