integrate
Merge branch 'master' of https://github.com/dl2868/wiki2.0

Conflicts:
	WebServer/web/MySQLConnector.py