conflict :)
Merge branch 'rms'

Conflicts:
	client/setup.php
Merge branch 'master' into rms
left menu delete