Clean up NSLog statements
Merge remote-tracking branch 'Git-IOS-UI/master'