Wrong template
Merge pull request #442 from jordi-puig/feature/update-vrrp-ip

Update vrrp ip in builder
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Create model in VCPEManager with PhysicalTopology.

VCPEManager needs a huge refactor to become a Resource.
PhysicalTopology should also change to be more flexibility.
In fact, it needs same flexibility as a NetworkModel, so using a NetworkResource to model it should be the way to go.

This patch creates the model and makes it accessible through WS.
PhysicalTopology is right now created using a properties file.
Add logic to check physical elements in VCPENetworkModel match physical topology.

Logic is implemented but not yet used.
new method in builder to swap VRRP priorites between routers
Merge pull request #441 from logoff/fix/router-capability-vrrp-avoid-set-the-model

Fix/router capability vrrp avoid set the model
Merge pull request #444 from logoff/feature/vcpe-builder-VRRP-update-priority

new method in builder to swap VRRP priorites between routers
added more error information into Karaf console error messages
Merge pull request #445 from logoff/fix/resource-start-errors

added more error information into Karaf console error messages
Merge branch 'develop' into feature/vcpe-manager-has-topology

Conflicts:
	extensions/bundles/vcpe/src/main/java/org/opennaas/extensions/vcpe/manager/IVCPENetworkManager.java

Conflict solved.
Compilation erros caused by changes in VCPENetworkElement solved.
org/opennaas/extensions/vcpe/model/PhysicalInfrastructure replaced by org/opennaas/extensions/vcpe/manager/model/VCPEPhysicalInfrastructure.
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Compilation error in VCPENetworkBuilder.java.
Duplicated method
Merge pull request #446 from jordi-puig/develop

Compilation error in VCPENetworkBuilder.java
Implement getPhysicalInfrastructure method in VCPEManager.
added loopback interfaces to vcPE builder and insert it to logical routers directly
Merge pull request #447 from logoff/feature/loopback-ifaces-vcpe-builder

added loopback interfaces to vCPE builder
added VRRP Integration Tests, some VRRP JunOS XML message generation tests and eliminated not used macors in VRRP velocity templates
GUI: activate the backup router to work as master

http://jira.i2cat.net/browse/OPENNAAS-793
added insert loopback interface test