no google play services map error fix
- change socketio library for https://github.com/Gottox/socket.io-java-client
- add location event
- add location handler
- add send location
no google play services map error fix
merge with upstream
event bus unregister
Delete config.xml
merge with upstream
merge with upstream
Merge remote-tracking branch 'origin/master'
onMarkerClickListener
minor code cleaning
merge upstream
Merge pull request #6 from bbaloo/master

fix merge conflicts