circle is ok
circle is finished
front end change
dfgbh
web all changed over
front end finished except trans
front end finished except connection to server
Merge branch 'neptune' of https://github.com/lejoying/weixintool into neptune

Conflicts:
	web/static/css/public.css
	web/user_mange.html