2013-12-25 baidu map
12-25
12-25
Merge pull request #31 from Nelsonfox/master

12-25今天的
Merge pull request #30 from joyicedtea/master

2013-12-25 baidu map
Merge remote-tracking branch 'eoeschool/master'
this is my work