docs
Merge branch 'master' of https://github.com/kakserpom/daemon.io

Conflicts:
	docs/css/styles.doc.css