fix
fix
Merge branch '0.2.1-SNAPSHOT' of ssh://git@github.com/licoliu/xmon-mobile.git into 0.2.1-SNAPSHOT

Conflicts:
	xmon-mobile/src/main/webapp/css/xmon-home.css
	xmon-mobile/src/main/webapp/js/app/com/ctrip/xmon/modual/warnings/all.js