ADD abb column in database
Merge branch 'yesi'
add return value
Merge commit 'dfebd9276d8e3bd2345f86fd13ba4677b0b025dc'

# By Yesi Xu
# Via Yesi Xu
* commit 'dfebd9276d8e3bd2345f86fd13ba4677b0b025dc':
  show location on the main view
  add Core Locaiton framework
Merge remote-tracking branch 'origin/master'
fix merge mistakes
put the location detector  to a separate file, but doesn’t trig the update method :(