Added an ArrayList so edges can be treated as aggregate edges
Added very basic color getters and setters to V_GenericEdges and Cytoscape edges
Merge branch '4.1'