Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Fix getGeoLocation timeout error to 3000.
Merge branch 'master' into dev
Merge branch 'dev' of github.com:onecampus/wine into dev