update
Merge branch 'master' of git@github.com:lifetea/xs.git

Conflicts:
	cat.js
	common/common.css