serverj
Merge branch '2.0-stable' of github.com:zhwei/gotit into 2.0-stable

Conflicts:
	code.py
Merge branch '2.0-stable' of github.com:zhwei/gotit into 2.0-stable