IMP dockerfile
Merge branch 'master' into test

Conflicts:
	Dockerfile
Merge branch 'test' into prod
Merge branch 'prod' into test