Improved Dockerfile for "npm install" to be cached
Merge branch 'master' of github.com:aduermael/dockerblog

Conflicts:
	app/Dockerfile