email checkout
Merge branch 'master' of https://github.com/fanghuang/Booksharepoint

Conflicts:
	handlers/action_handlers.py
	models.py
	static/js/main.js
Merge branch 'master' of https://github.com/fanghuang/Booksharepoint

Conflicts:
	static/js/main.js
Merge branch 'master' of https://github.com/fanghuang/Booksharepoint

Conflicts:
	static/js/main.js