new improved editor
Merge branch 'master' of github.com:lyubovmaslyannikova/WebDocs

Conflicts:
	WebDocs/docs.php