Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead
of old ref
Fix: [ bug #1553 ] Saving User displays setup removes menu
Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog