Removed duplicate entity code and fixed cooperative PSO which wasnt being initialised correctly.
Added anna-earwen's MeasurementCombiner fix.
Merge pull request #119 from filinep/entity

Removed duplicate entity code. Correct cooperative PSO initialisation.