updates for iOS 6.0 to fix view controller runtime errors and compiler warnings
merge