Merge branch 'master' of github.com:swastik/ember-inline-edit

Author: Swastik Agarwal

tests/dummy/app/templates/appearance.hbs

@@ -60,13 +60,6 @@
         <td class="pa1">Shows (or hides) the cancel button*</td>
       </tr>
 
-      <tr class="striped--near-white">
-        <td class="pa1">showCancelButton</td>
-        <td class="pa1 mid-gray code">Boolean</td>
-        <td class="pa1 mid-gray code">true</td>
-        <td class="pa1">Shows (or hides) the cancel button*</td>
-      </tr>
-
       <tr class="striped--near-white">
         <td class="pa1">showEditButton</td>
         <td class="pa1 mid-gray code">Boolean</td>