Merge branch 'master' of /home/qiaocy/popush with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
fix some bugs
Merge remote-tracking branch 'origin/master'
fix some bugs