tips提示
Merge branch 'master' of github.com:wangwenming/www
订阅和取消订阅清空我的提醒的缓存
Merge branch 'master' of github.com:wangwenming/www

Conflicts:
	resource/js/alarm/collections/item.js