Merge branch 'kmom05'
Merge branch 'kmom05'
Config for server
Merge branch 'kmom05Server'

Conflicts:
	kmom05/config.php
comitt
Merge branch 'kmom05'
Config
New submenu
Added new code
Changed comitt