Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Create fake template to test
http://jira.i2cat.net/browse/OPENNAAS-837
Merge pull request #496 from jordi-puig/develop

Create fake template to test