Merge branch 'develop' into feature/addRouter

# Conflicts:
#	cluster/directory/base_directory.go
#	cluster/router/chain/factory.go
#	cluster/router/router.go
#	common/extension/router_factory.go
#	common/url.go