Merge branch 'master' of https://github.com/JoelEager/schedulemaker into JoelEager-master

Author: bgrawi

assets/src/modules/sm/App/providers/globalKbdShortcutsFactory.js

@@ -1,7 +1,7 @@
 angular.module('sm').factory('globalKbdShortcuts', function($rootScope) {
 	var globalKbdShortcuts = {
-		'bindCtrlEnter': function(callback) {
-			Mousetrap.bind('mod+enter', function(e) {
+		'bindEnter': function(callback) {
+			Mousetrap.bind('enter', function(e) {
 			    $rootScope.$apply(callback);
 			    return true;
 			});

assets/src/modules/sm/Search/controllers/SearchController.js

@@ -1,6 +1,7 @@
 /**
  * The controller holding all the logic for the search page
  */
+
 angular.module('sm').controller('SearchController', function($scope, $http, entityDataRequest, globalKbdShortcuts) {
 
 	var defaultOptions = {
@@ -203,7 +204,7 @@ angular.module('sm').controller('SearchController', function($scope, $http, enti
 		}, 100);
 	};
 
-	globalKbdShortcuts.bindCtrlEnter($scope.findMatches);
+	globalKbdShortcuts.bindEnter($scope.findMatches);
     globalKbdShortcuts.bindPagination(function() {
     	if (this.keyCode == 39 && $scope.searchPagination.currentPage + 1 < $scope.numberOfPages()) {
     		$scope.searchPagination.currentPage++;