Merge branch 'master' of github.com:mir06/telescope

type in manual.py

Conflicts:
	telescope/server/plugins/manual.py
Merge branch 'master' of github.com:mir06/telescope