Merge branch 'master' into v2

Author: Urigo

src/calendar.js

@@ -26,8 +26,9 @@ angular.module('ui.calendar', [])
                       // In this way the function will be safely executed on the next digest.
 
                       var args = arguments;
+                      var _this = this;
                       $timeout(function(){
-                          functionToWrap.apply(this, args);
+                        functionToWrap.apply(_this, args);
                       });
                   };
               }

test/calendar.spec.js

@@ -376,9 +376,7 @@ describe('uiCalendar', function () {
               var fullCalendarConfig = calendarCtrl.getFullCalendarConfig(scope.uiConfig.calendar, {});
 
               fullCalendarConfig[key]();
-
               $timeout.flush();
-
               expect($rootScope.$apply.callCount).toBe(functionCount);
               expect(scope.uiConfig.calendar[key]).toHaveBeenCalled();
               $rootScope.$apply.isSpy = false;
@@ -415,7 +413,6 @@ describe('uiCalendar', function () {
 
               scope.$apply();
               $timeout.flush();
-
               expect($rootScope.$apply.callCount).toBe(functionCount*2);
               expect(scope.uiConfig.calendar[key]).toHaveBeenCalled();
             }