update points policy and functions
Merge branch 'master' of https://github.com/whitefoxx/xb-test

Conflicts:
	xinshu/apps/users/apis.py