Abdullah - Conflict resolution and Cluster Reports changes
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015