Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/MainFirstActivity.java
	src/com/mobilenpsite/android/MainNewCTInfoActivity.java
	src/com/mobilenpsite/android/MainOthersActivity.java
	src/com/mobilenpsite/android/ui/base/BaseActivity.java
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/MainFirstActivity.java
	src/com/mobilenpsite/android/MainNewCTInfoActivity.java
	src/com/mobilenpsite/android/MainOthersActivity.java
	src/com/mobilenpsite/android/ui/base/BaseActivity.java