新增Socket连接包
no
Merge branch 'master' of https://github.com/New-Begin/Touch.git

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/com/newbegin/touch/BuildConfig.class
	bin/classes/com/newbegin/touch/LoginActivity.class
	bin/classes/com/newbegin/touch/R$attr.class
	bin/classes/com/newbegin/touch/R$dimen.class
	bin/classes/com/newbegin/touch/R$drawable.class
	bin/classes/com/newbegin/touch/R$id.class
	bin/classes/com/newbegin/touch/R$layout.class
	bin/classes/com/newbegin/touch/R$menu.class
	bin/classes/com/newbegin/touch/R$string.class
	bin/classes/com/newbegin/touch/R$style.class
	bin/classes/com/newbegin/touch/R.class
	src/com/newbegin/touch/LoginActivity.java
some
doesn't matter
Merge branch 'master' of https://github.com/New-Begin/Touch.git

Conflicts:
	src/com/newbegin/touch/LoginActivity.java