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

Conflicts:
	src/com/mobilenpsite/android/ui/activity/patient/PatientMainBottomActivity.java
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/ui/activity/patient/PatientMainBottomActivity.java
1.点击通知栏activity重复启动问题；
2.关注对象为多个时添加判断，我的关注返回时没有退出提示，导航条没有效果，关注列表没有过滤功能，等问题。
Merge branch 'master' of github.com:Alife/Android