added basic docker support (WIP)
Merge commit 'cd4a0c0c2dbfdef8d845fe7cb90af7f618a25fcf'