Dockerfile: ADD /app/
Merge branch 'step2' into step3