Init
Merge branch 'master' of https://github.com/lugehenni/xiaonan_b.git

Conflicts:
	Btcte/AndroidManifest.xml
	Btcte/libs/android-support-v4.jar
	Btcte/libs/armeabi/libbdpush_V1_0.so
	Btcte/libs/async-http-1.4.4.jar
	Btcte/libs/mips/libbdpush_V1_0.so
	Btcte/libs/pushservice-3.0.0.jar
	Btcte/libs/x86/libbdpush_V1_0.so
	Btcte/proguard-project.txt
	Btcte/project.properties
	Btcte/res/anim/slide_left_in.xml
	Btcte/res/anim/slide_left_out.xml
	Btcte/res/anim/slide_right_in.xml
	Btcte/res/anim/slide_right_out.xml
	Btcte/res/drawable-hdpi/ic_launcher.png
	Btcte/res/layout/btc_layout.xml
	Btcte/res/layout/item_layout.xml
	Btcte/res/layout/main.xml
	Btcte/res/layout/set_layout.xml
	Btcte/res/layout/unfold_layout.xml
	Btcte/res/layout/warn_layout.xml
	Btcte/res/menu/main.xml
	Btcte/res/values/colors.xml
	Btcte/res/values/dimens.xml
	Btcte/res/values/strings.xml
	Btcte/res/values/styles.xml
	Btcte/src/com/btcte/BtcFragment.java
	Btcte/src/com/btcte/LtcFragment.java
	Btcte/src/com/btcte/MainActivity.java
	Btcte/src/com/btcte/SetFragment.java
	Btcte/src/com/btcte/StockFragment.java
	Btcte/src/com/btcte/WarnFragment.java
	Btcte/src/com/btcte/adapter/BtcAdapter.java
	Btcte/src/com/btcte/base/BaseApplication.java
	Btcte/src/com/btcte/base/BaseFragment.java
	Btcte/src/com/btcte/base/BaseFragmentActivity.java
	Btcte/src/com/btcte/model/Info.java
	Btcte/src/com/btcte/model/ParseJson.java
	Btcte/src/com/btcte/ui/ExpLayout.java
	Btcte/src/com/btcte/utils/TabManager.java