详情页订阅取消功能
push
Merge branch 'master' of github.com:wangwenming/www

Conflicts:
	alarm.html
	resource/js/alarm/views/detail-page.js