Add development dockerfile
Merge branch 'dockerfile'