Merge branch 'master' of https://bdgit.educoder.net/peb579c3i/dingruihua_mimaintain into mengbo_branch

# Conflicts:
#	src/main/java/net/micode/notes/ui/NotesListActivity.java
#	src/main/res/drawable-hdpi/menu_lover.png
#	src/main/res/drawable-hdpi/menu_young.png
#	src/main/res/menu/note_list.xml
#	src/main/res/values/strings.xml

src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="net.micode.notes"
     android:versionCode="1"
     android:versionName="0.1" >
@@ -82,7 +83,8 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="MissingClass">
         </activity>
 
 
@@ -196,6 +198,13 @@
             android:theme="@android:style/Theme.Holo.Light" >
         </activity>
 
+        <activity
+            android:name="net.micode.notes.ui.BoardActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Holo.Light" >
+        </activity>
+
         <service
             android:name="net.micode.notes.gtask.remote.GTaskSyncService"
             android:exported="false" >

src/main/java/net/micode/notes/ui/LoginActivity.java

@@ -40,7 +40,7 @@ public class LoginActivity extends Activity {
                                         public void onClick(View v) {
                                             SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
                                             String password=pref.getString("password","");
-                                            if(password.equals("")==false&&password.equals(lg_password.getText().toString())==true){
+                                            if(password.equals("")==false&& password.equals(lg_password.getText().toString())==true){
                                                 Intent intent=new Intent(LoginActivity.this,NotesListActivity.class);
                                                 startActivity(intent);
                                                 finish();