modified initCollocationgraph
Merge branch 'master' of https://github.com/HuangZhenQiu/WukongMapper

Conflicts:
	src/edu/uci/eecs/wukong/common/CollocationGraph.java
	src/edu/uci/eecs/wukong/common/CollocationGraphNode.java
merge fix on louis local machine