Merge branch 'master' of git.linkerplus.com:houyt/xinde11

# Conflicts:
#	testone.txt

testone.txt

@@ -3,9 +3,16 @@ div ng-if="item.t__type == 1">
     <div class="item item-input">
         <span>{{item.name}}</span>
         <label class="input-margin">
-       <p>this is an old world</p>
+     <input type="text" ng-model="item.text" placeholder="{{note}}" style="background-colro:black;colro:red">
+        <p>this is a new world</p>
             <input type="text" ng-model="item.text" placeholder="{{note}}" style="background-colro:black;colro:red">
+<<<<<<< .mine
     
+
+=======
+     
+
+>>>>>>> .theirs
         </label>
     </div>
 </div>