ff
add compress
add compress
save
Merge branch 'static' into up

Conflicts:
	mianjing/view/list.tpl
	mianjing/view/mianjingView.js
	package.json