Merge remote-tracking branch 'origin/master'

Conflicts:

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/Login.class

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/MyGoods.class

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/NavigationDrawerFragment.class

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/R$id.class

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/R$layout.class

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/R$menu.class

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/R$string.class

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/R$style.class

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/Register.class

	Android_Client/SecondHandPlatformClient/gen/zju/secondhandplatform/client/R.java