Merged conflict with angular-ui-router version and ngTouch module

Author: hi

bower.json

@@ -10,7 +10,7 @@
     "angular-cookies": "^1.5.0",
     "angular-touch": "^1.5.0",
     "angular-sanitize": "^1.5.0",
-    "angular-ui-router": "^0.2.18",
+    "angular-ui-router": "^0.3.2",
     "angular": "^1.5.0",
     "angular-nvd3": "1.0.0-rc.2",
     "angular-material": "^1.0.6",

src/app/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('angularMaterialAdmin', ['ngAnimate', 'ngCookies', 'ngTouch',
+angular.module('angularMaterialAdmin', ['ngAnimate', 'ngCookies',
   'ngSanitize', 'ui.router', 'ngMaterial', 'nvd3', 'app' , 'md.data.table'])
 
   .config(function ($stateProvider, $urlRouterProvider, $mdThemingProvider,

src/app/views/partials/checkboxes.html

@@ -15,7 +15,7 @@ <h4 flex="82">{{vm.remaining()}} of {{vm.todos.length}} remaining</h4>
                 <label>Write some todo task here...</label>
                 <input ng-model="vm.todoText" name="taskText" required>
             </md-input-container>
-            <md-button class="md-fab md-wayrn md-mini">
+            <md-button class="md-fab md-wayrn md-mini" ng-click="vm.addTodo($event)">
                 <i class="material-icons">add</i>
             </md-button>
         </div>