Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Add the literals in properties files.
Merge pull request #539 from jordi-puig/develop

Develop