Updated dockerfile to new apache/php build stuff.
Merge branch 'master' of https://github.com/reibb/webserver

Conflicts:
	Dockerfile