zh-tw version ,COSCUP'14 Location update
zh-cn version , COSCUP'14 Location update.
Merge pull request #2 from mousems/master

update location information, r=evelyn