Fix default installation directory - allows entries in config.php to be commented out
Merge branch 'master' into devel

Conflicts:
	includes/defaults.inc.php