Add basic Dockerfile
Merge branch 'makeBaseImage' into dev
Merge branch 'dev'