socket v1
111
Merge branch 'develop' of https://github.com/tecle/AndroidProject1 into develop