Merging test with master

Edges fixed, wheighs added, colour class removed, moving fixed.