changed "///////" to "//#/////" to improve doxygen output, removed redundant blank lines
Merge branch 'master' of github.com:snap-stanford/snap

Conflicts:
	snap-core/network.h