Removed temp files
Fixed some of the code to use the latest AppMeasurement library
Resolved Conflicts