Merge remote-tracking branch 'origin/ningjing' into ningjing

Conflicts:
	patterns/algrithm/graph/Graph.java