svn commit #2

git-svn-id: svn://brown.hi.inet/testrepo/wp3/software/FI-WARE/fiware-monitoring/trunk@2 2c955bc2-6b21-c947-a3ff-ed1217ac8094
Merge branch 'xifi' into xifisvnsync

git-svn-id: svn://brown.hi.inet/testrepo/wp3/software/FI-WARE/fiware-monitoring/trunk@3 2c955bc2-6b21-c947-a3ff-ed1217ac8094
svn commit #3

git-svn-id: svn://brown.hi.inet/testrepo/wp3/software/FI-WARE/fiware-monitoring/trunk@4 2c955bc2-6b21-c947-a3ff-ed1217ac8094