premerge
Merge remote-tracking branch 'origin/master'

merged kyle's changes, using app delegate and appdetailviewcontroller in objc
postmerge go