Test updated
Grammar fixes
Merge pull request #516 from telefonicaid/hardening/accept_fail_test

Test updated
Merge branch 'hardening/style_guide_in_convenience_lib' into release/iotplatform-v1
Merge branch 'release/iotplatform-v1' into hardening/style_guide_in_convenienceMap_lib
Merge pull request #530 from telefonicaid/hardening/style_guide_in_convenienceMap_lib

Hardening/style guide in convenience map lib
Merge branch 'release/iotplatform-v1' into hardening/style_guide_in_src_app_contextBroker
Merge pull request #531 from telefonicaid/hardening/style_guide_in_src_app_contextBroker

Hardening/style guide in src app context broker
Merge branch 'release/iotplatform-v1' into hardening/style_guide_in_serviceRoutines_lib
Merge pull request #533 from telefonicaid/hardening/style_guide_in_serviceRoutines_lib

Hardening/style guide in service routines lib
Merge branch 'release/iotplatform-v1' into hardening/style_guide_in_jsonParse_lib
Merge branch 'release/iotplatform-v1' into hardening/style_guide_in_xmlParse_lib
Merge pull request #534 from telefonicaid/hardening/style_guide_in_jsonParse_lib

Hardening/style guide in json parse lib
Merge branch 'release/iotplatform-v1' into hardening/style_guide_in_orionTypes_lib
Merge pull request #535 from telefonicaid/hardening/style_guide_in_xmlParse_lib

Hardening/style guide in xml parse lib
Adding orionTypes/CMakeLists.txt
Merge remote branch 'origin/hardening/style_guide_in_orionTypes_lib' into hardening/style_guide_in_orionTypes_lib
Merge pull request #536 from telefonicaid/hardening/style_guide_in_orionTypes_lib

Hardening/style guide in orion types lib
Merge branch 'release/iotplatform-v1' into hardening/style_guide_in_ngsi_lib