update demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	thin/demo/area.html
	thin/demo/js/staffManage.js
	thin/demo/staff.html
Merge remote-tracking branch 'origin/master'