add points and tags
Merge branch 'master' of https://github.com/whitefoxx/xb-test

Conflicts:
	xinshu/apps/books/shortcuts.py
	xinshu/decorators/permissions.py
update point and tag modules
Merge branches 'master' and 'master' of https://github.com/whitefoxx/xb-test

Conflicts:
	xinshu/apps/articles/apis.py
	xinshu/apps/articles/serializers.py
	xinshu/apps/articles/shortcuts.py
	xinshu/apps/books/shortcuts.py