Created base directory for server base and application docker containers
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/docker/Dockerfile
Created base directory for server base and application docker containers