added test for network saveParameters
minor change in network
merged with changes made last time at DW PC
merged changes from master
worked on integrating save and load
merge
fixed bug when choosing a protein for a connection