Add Git, Pull code, Config apache & railor
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Dockerfile