Merge remote-tracking branch 'upstream/master'

Author: dgrant

library/src/main/java/com/alamkanak/weekview/WeekView.java

@@ -400,7 +400,7 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
 
             // If the week view is being drawn for the first time, then consider the first day of the week.
             if(mNumberOfVisibleDays >= 7 && mToday.get(Calendar.DAY_OF_WEEK) != mFirstDayOfWeek) {
-                int difference = 7 + (mToday.get(Calendar.DAY_OF_WEEK) - mFirstDayOfWeek);
+                int difference = (7 + (mToday.get(Calendar.DAY_OF_WEEK) - mFirstDayOfWeek)) % 7;
                 mCurrentOrigin.x += (mWidthPerDay + mColumnGap) * difference;
             }
         }
@@ -851,7 +851,11 @@ else if (!isEventsCollide(eventRect.event, column.get(column.size()-1).event)) {
 
 
         // Calculate left and right position for all the events.
-        int maxRowCount = columns.get(0).size();
+        // Get the maxRowCount by looking in all columns.
+        int maxRowCount = 0;
+        for (List<EventRect> column : columns){
+            maxRowCount = Math.max(maxRowCount, column.size());
+        }
         for (int i = 0; i < maxRowCount; i++) {
             // Set the left and right values of the event.
             float j = 0;