Abdullah - Conflict resolutions and new Page
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp.git