Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v1.0

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/CommonUtil.java
#	app_core/common/src/main/java/com/core/model/SelectCollisionTurnBean.java
#	app_core/network/src/main/java/com/me/network/app/http/impl/RetrofitImpl.java
#	app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ComplaintDetailActivity.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ProcessMsgActivity.java
#	app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/TaskAddErpActivity.java
#	app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -114,10 +114,8 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
         setContentView(R.layout.activity_contacts);
         ViewUtils.inject(this);
         contactsDao = ContactsDao.getInstance();
-        
         initView();
         initData();
-        
     }
 
     private ServiceConnection mServiceConnection = new ServiceConnection() {