Added timestamps to Dockerfile in order to debug build durations on dockerhub
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dockerfile