synchronize with master
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
增加了优先级接口