before removing NSLog
Flurry analytics, minor changes
merged with Neel
before merging thursday morning