2014.9.11
Merge remote-tracking branch 'origin/master'

Conflicts:
	ADT/Graph.h