Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Merge pull request #497 from maneljara/develop

Modified CSS from new jQuery UI
Error in redirection updateIps
Merge pull request #498 from jordi-puig/develop

Error in redirection updateIps
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Problem with Locale
alerts in JS
Suggest VRRP group dynamically.

Preferred VRRP group is down interfaces vlan tag. Selected from DOWN1 interface.
If preferred VRRP group is already assigned to another VCPE,
then suggested group is the first free VRRP group identifier.
Launch exception when there is no valid suggestion.
Add NOC IP Range
Merge pull request #499 from jordi-puig/develop

 Add NOC IP Range and Problem with Locale
Merge pull request #500 from isartcanyameres/feature/vcpe-suggest-vrrp-dynamically

Feature/vcpe suggest vrrp dynamically
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Add a simple rollback mechanism to sp vcpe builder.

This rollback removes logical routers and/or links, if they are created, when an exception is launched during building.
Avoid overriding isFree value for vlans and units in different vcpes.

Before this patch, retured value in isFreeVlan and isFreeUnit was the result of isFree in only the last evaluated vcpe.
This was due to isFree value overriden in each vcpe.

This patch ensures value is not overriden, but instead isFree is the result of ANDing for each vcpe.
Exchange traversals for searches in isFreeChecker.

Unfortunatelly, the use of iterators makes the class less readable.
Suggest NOC IP range with a value taken from properties file.
Merge pull request #501 from isartcanyameres/fix/dont-override-isFree-value-in-each-vcpe

Avoid overriding isFree value for vlans and units in different vcpes.
Merge pull request #502 from isartcanyameres/feature/dummy-rollback-in-sp-vcpe-builder

Add a simple rollback mechanism to sp vcpe builder.
Merge pull request #503 from isartcanyameres/fix/suggest-noc-iprange-with-hardcoded-value

Suggest NOC IP range with a value taken from properties file.