Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
WAN Interfaces in logical view
Merge pull request #512 from jordi-puig/develop

 WAN Interfaces in logical view
Merge branch 'develop' into feature/mp-vcpe-element-definition

Conflicts:
	clients/opennaas-gui-vcpe/src/main/java/org/opennaas/gui/vcpe/utils/model/VCPEBeanUtils.java

Both modified VCPEBeanUtils.java.
Conflicts solved by manually merging.