Fix bin/compile
Add conf/config.php for Mahara configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/compile
	conf/config.php