telefonicaid/fiware-paas — pull request #87 by jesuspg (2014-10-20 08:55:45+00:00)
Title: fix changes in order to sync develop with master

@hmunfru @flopezag