update alert
Merge branch 'master' of https://github.com/yangru/yaodu

Conflicts:
	mobile/modules/user/user.js