Merge conflict in NodeHandler.mxml
Merge remote-tracking branch 'origin/foo' into new_foo
Merge Conflict
Merge commit 'cfd844f' into new_foo2

Conflicts:
	WeaveUI/src/weave/ui/infomap/layout/NodeHandler.mxml
Cluster RadViz label and apply cdLayout for InfoMap; Add google custom search as a datasource
Merge remote-tracking branch 'origin/foo' into new_foo2