Add requirements.txt
Update README.rst
Update requirements.txt
Update README
Update lixian_api.py
Merge pull request #45 from mozillazg/patch-1

Add requirements.txt
Merge pull request #47 from ubunttua/patch-2

Update lixian_api.py
add google oauth2
add root_user_mode
remove async_callback for tornado 4.0
Merge branch 'new'

Conflicts:
	handlers/login.py
	libs/lixian_api.py
	libs/util.py
	main.py
	requirements.txt