Merge "Add color setting for Saturday and Sunday in month view"