adding Docker entity and Docker locations - wip
more on locations - wip
more work - still unstable
Fix DockerInfrastructure.fabric filter
Adds DockerHostLiveTest (work in progress)
adding Docker entity and Docker locations - wip
Minor updates
Merge branch 'feature/locations-and-hierarchy' of github.com:cloudsoft/brooklyn-docker into grkvlt/locations-and-hierarchy

* 'feature/locations-and-hierarchy' of github.com:cloudsoft/brooklyn-docker:
  Adds DockerHostLiveTest (work in progress)
  Fix DockerInfrastructure.fabric filter
  more work - still unstable
  more on locations - wip
  adding Docker entity and Docker locations - wip

Conflicts:
	docker-examples/src/main/resources/logback.xml
	docker/src/main/java/brooklyn/entity/container/docker/DockerAttributes.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerContainerImpl.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerHost.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerHostImpl.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerInfrastructure.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerInfrastructureImpl.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerNodePlacementStrategy.java
	docker/src/main/java/brooklyn/location/docker/DockerContainerLocation.java
	docker/src/main/java/brooklyn/location/docker/DockerHostLocation.java
	docker/src/main/java/brooklyn/location/docker/DockerLocation.java
Fix some build errors
Futher build error fixes
more work towards the stability
fix SingleWebServerExample
Merge branch 'feature/locations-and-hierarchy' of github.com:cloudsoft/brooklyn-docker into grkvlt/locations-and-hierarchy

* 'feature/locations-and-hierarchy' of github.com:cloudsoft/brooklyn-docker:
  fix SingleWebServerExample
  more work towards the stability

Conflicts:
	docker/src/main/java/brooklyn/entity/container/docker/DockerInfrastructure.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerInfrastructureImpl.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerNodePlacementStrategy.java
	docker/src/main/java/brooklyn/location/docker/DockerContainerLocation.java
	docker/src/main/java/brooklyn/location/docker/DockerLocation.java
Move to fix case (1)
Move to fix case (2)
Fix build error
Merge pull request #5 from cloudsoft/grkvlt/locations-and-hierarchy

Updates to locations and hierarchy