map geolocation update test code
offline time update to 10min
update test geolocation
update push timeout
update geolocation
update geolocation
update
disconnect
update
update
Merge branch 'master' of github.com:wondger/together

Conflicts:
	web/codes/together/map/mapunit.js
createTopMenu
gelocation test code
update add-activity log
update
update
Merge branch 'master' of github.com:wondger/together

ether
update geolocation test data
update avatar server logic
update avatar generate on server
avatar base64 type jpeg
update log