add GPS, Call block and Get contacts

Add gps, call block and get contacts
fix confilict
fix location and contact bugs

location and contacts are working ok now
Merge remote-tracking branch 'origin/master' into branch-for-wenxin