Merge branch 'master' into develop

README.md

@@ -93,8 +93,6 @@ A NuGet package is available [here](https://github.com/blachniet/bootstrap-switc
 
 ## License
 
-Licensed under the Apache License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0
-
-We are in the process of changing from Apache to MIT. If you contributed before February 5th, 2015, please add your vote here to accept license change: 
+Licensed under the MIT License
 [https://github.com/nostalgiaz/bootstrap-switch/issues/347](https://github.com/nostalgiaz/bootstrap-switch/issues/347)
+

documentation-2.html

@@ -143,7 +143,7 @@
                 <td>'OFF'</td>
               </tr>
               <tr>
-                <td>text-label</td>
+                <td>label-text</td>
                 <td>String</td>
                 <td>Text of the center handle of the switch</td>
                 <td>String</td>
@@ -317,4 +317,4 @@
     <script src="dist/js/bootstrap-switch.js"></script>
     <script src="docs/js/main.js"></script>
   </body>
-</html>
+</html>

src/docs/jade/documentation-2.jade

@@ -81,7 +81,7 @@ block content
             td String
             td 'OFF'
           tr
-            td text-label
+            td label-text
             td String
             td Text of the center handle of the switch
             td String