Config for server
Merge branch 'kmom05Server'

Conflicts:
	kmom05/config.php