todolist
Merge branch 'master' of ssh://edfward.com/srv/git/xuezhangshuo
fix login bug
Merge branch 'master' of ssh://edfward.com/srv/git/xuezhangshuo

Conflicts:
	xuezhangshuo/views.py
user profile
added server-side validation for emails when registering; modified register page