增加可以使用。
Merge remote-tracking branch 'origin/master'

Conflicts:
	yardApp/static/js/App.js
Merge remote-tracking branch 'origin/master'