util.py: added option to return threshold value to threshold_adjacency_matrix
resolved conflicts in util.py
Fixed 371 indentation error & removed '<<<< HEAD'
BF: Fix bug in WeightedPartition, specificying nx.adjacency_matrix(graph).todense()