Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Problem with Locale
alerts in JS
Add NOC IP Range
Merge pull request #499 from jordi-puig/develop

 Add NOC IP Range and Problem with Locale