Changes to support Qt 5. Also created a much better colony list merge algorithm.