O
sdsdMerge branch 'master' of github.com:haoericliu/haoliu

Conflicts:
	controllers/registerhandler.py
kljO
register done