clean up
Merge branch 'master' of github.com:shuge/man

Conflicts:
	debian/debian-desktop-quick-config-guide.md
rm srv/logging/
Merge branch 'master' of github.com:shuge/man
added srv/log/deploy-logstash.md