Merge branch 'guo_branch' into develop

ranch 'guo_branch' into develop
B
 the commit.

src/model/WorkingNote.java

@@ -18,7 +18,7 @@ import net.micode.notes.tool.ResourceParser.NoteBgResources;
 
 
 public class WorkingNote {
-    // Note for the working 
+    // Note for the working note
     private Note mNote;
     // Note Id
     private long mNoteId;

src/widget/NoteWidgetProvider.java

@@ -2,9 +2,7 @@
  * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
+ 
  *        http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software

src/widget/NoteWidgetProvider_2x.java

@@ -1,18 +1,4 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+
 //主要功能包括：
 //指定2x小部件使用布局
 //提供2x小部件专用的背景资源

src/widget/NoteWidgetProvider_4x.java

@@ -1,11 +1,7 @@
 /*
  * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
+
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,