Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
ResourceManager ws using REST and DOSGI (resource lifecycle methods only).

Exported methods:
* String createResource(ResourceDescriptor)
* void startResource(String id)
* void stopResoource(String id)
* void removeResource(String id)
* String getNameFromResourceID(String id)

Failing methods:
* IResource getResourceById(String id)
* List<IResource> getResources()
* List<IResource> getResourcesByType(String type)
* List<String> getResourceTypes()
[maven-release-plugin] prepare for next development iteration
Merge branch 'master' of github.com:dana-i2cat/opennaas into release-0.13-cont

Conflicts:
	utils/examples/descriptors/idb.descriptor
Merge pull request #268 from adrian-rosello/release-0.13-cont

Release 0.13 cont
Protocols:context command interactively asks for passwords.

This way passwords don't need to be in the command, which caused
them to be visible and even stored in history file.

Although strongly discouraged, passwords can be specified in the command, just like before.
However, a new way to specify passwords is introduced:

protocols:context -i (--interactive) tells the command to ask for passwords when required.
This way, CLI is used to introduce passwords, which are not displayed nor stored in visible places.
Allow using backspace and arrow keys to modify passwords.

It is done by using jline.console.ConsoleReader to read the password,
and thus taking advantage of keyboard management done there :)
Remove testing traces and unnecesary code.
Move netconf4j dedicated code in ContextCommand to NetconfProtocolSession.
Merge pull request #269 from isartcanyameres/feature/shell-asks-passwords-interactively

Feature/shell asks passwords interactively
Improve logs configuration with protocols and macbridge log.
Improve logs in logical routers creation.
Improve logs in NetworkBasicCapability.

Created devices, interfaces and connections are now logged.

NOTE: WS logs configuration has been changed, due to a restriction
(see org.ops4j.pax.logging.cfg).
Added placeholder for bandwidth in network model.

L2 interfaces have now a bandwidth field, representing the interface bandwidth in bit/s.
Refactores IResource interface.

Now IResource does not inherit from ILifecycle, and it has less methods (no setters).
Profile getter/setter have been moved to IProfiled interface.

Resource class, now implements IResource, ILifecycle and IProfiled.

Some classes have been modified to use Resource instead of IResource,
mostly bootstrappers adn some tests.
Add FIXME description in CLIProtocolSession.

Prompt values are used as delimiters for cli output.
Hence, having a delimiter used in the output will cause the output to be cut.

Delimiters shoud be specified per resource type, or per session in its
ProtocolSessionContext.

Delimiters currently harcoded in CLIProtocolSession correspond to
cisco catalyst prompt, but should not be used in CLI sesions to other
resources.
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
The new CIM model has problems to be generated
Bad version in pom files
Merge branch 'bug/cim-model-not-generated' of git://github.com/jordi-puig/opennaas into bug/cim-model-not-generated

Conflicts:
	clients/pom.xml
	clients/tnc-demo-web/pom.xml
	utils/new-cim/cim-model/pom.xml
	utils/new-cim/cim-tool/pom.xml