add text
Merge remote-tracking branch 'origin/user-manual'

Conflicts:
	manual/admin.md