20131202
Merge branch 'master' of https://github.com/imlinhao/location