Merge branch 'master' of https://github.com/dana-i2cat/mqnaas into fix/examples-bundles

Conflicts:
	examples/api-testapp/src/main/java/org/mqnaas/examples/api/testapp/APIConnectorTestApp.java
	examples/testapp/src/main/java/org/mqnaas/examples/testapp/MyTestApplication.java